Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ci): update electron-builder.yml #1483

Closed
wants to merge 8 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 9 additions & 22 deletions .github/workflows/build_desktop.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,33 +28,20 @@ jobs:
with:
node-version: '18.17'

- name: use pnpm
uses: pnpm/action-setup@v2
with:
version: 8

- name: Cache pnpm modules
uses: actions/cache@v3
with:
path: ~/.pnpm-store
key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-

- name: Install dependencies
run: pnpm install
- name: Install Dependencies
run: npm install

- name: Build Linux
- name: build-linux
if: matrix.os == 'ubuntu-latest'
run: pnpm run build:linux
run: npm run build:linux

- name: Build macOS
- name: build-mac
if: matrix.os == 'macos-latest'
run: pnpm run build:mac
run: npm run build:mac

- name: Build Win
- name: build-win
if: matrix.os == 'windows-latest'
run: pnpm run build:win
run: npm run build:win

# - name: release
# uses: softprops/action-gh-release@v1
Expand All @@ -72,7 +59,7 @@ jobs:
# dist/*.yml
# dist/*.blockmap
# env:
# GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# jobs:
# build:
# runs-on: ubuntu-20.04
Expand Down
4 changes: 2 additions & 2 deletions apps/desktop/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ An Electron application with Vue and TypeScript
### Install

```bash
$ pnpm install
pnpm install
```

### Development

```bash
$ pnpm dev
pnpm dev
```

### Build
Expand Down
7 changes: 4 additions & 3 deletions apps/desktop/electron-builder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ asarUnpack:
win:
executableName: MQTTX
nsis:
artifactName: ${name}-${version}-setup.${ext}
artifactName: ${productName}-${version}-setup.${ext}
shortcutName: ${productName}
uninstallDisplayName: ${productName}
createDesktopShortcut: always
Expand All @@ -27,8 +27,9 @@ mac:
- NSDownloadsFolderUsageDescription: Application requests access to the user's Downloads folder.
notarize: false
dmg:
artifactName: ${name}-${version}.${ext}
artifactName: ${productName}-${version}.${ext}
linux:
executableName: MQTTX
target:
- AppImage
- snap
Expand All @@ -37,7 +38,7 @@ linux:
maintainer: electronjs.org
category: Utility
appImage:
artifactName: ${name}-${version}.${ext}
artifactName: ${productName}-${version}.${ext}
npmRebuild: false
publish:
provider: generic
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default defineConfig({
},
build: {
lib: {
entry: path.resolve(__dirname, '/src/index.ts'),
entry: path.resolve(__dirname, 'src/index.ts'),
name: '@mqttx/ui',
fileName: 'index',
formats: ['es'],
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/vitest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export default mergeConfig(
environment: 'jsdom',
root: fileURLToPath(new URL('./', import.meta.url)),
coverage: {
provider: 'istanbul', // or 'v8'
provider: 'istanbul',
all: true,
},
},
Expand Down
Loading