diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 85a88679b..b6d5ec5be 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,9 +30,12 @@ jobs: path: ./renderer/dist retention-days: 1 - windows: + package: needs: renderer - runs-on: windows-2019 + strategy: + matrix: + os: [windows-2019, ubuntu-20.04, macos-11] + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 @@ -49,25 +52,11 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Hash + if: ${{ startsWith(matrix.os, 'windows') }} run: type .\main\dist\latest.yml - - linux: - needs: renderer - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - - uses: actions/download-artifact@v3 - with: - name: renderer-dist - path: ./renderer/dist - - run: yarn --frozen-lockfile - working-directory: ./main - - run: yarn build - working-directory: ./main - - run: yarn package -p onTagOrDraft - working-directory: ./main - env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Hash + if: ${{ startsWith(matrix.os, 'ubuntu') }} run: cat ./main/dist/latest-linux.yml + - name: Hash + if: ${{ startsWith(matrix.os, 'macos') }} + run: cat ./main/dist/latest-mac.yml diff --git a/main/electron-builder.yml b/main/electron-builder.yml index 6442255d8..88eddb5ba 100644 --- a/main/electron-builder.yml +++ b/main/electron-builder.yml @@ -23,11 +23,10 @@ linux: - "AppImage" mac: target: - - target: default - arch: - - universal - # MacOS apps can only be run on other systems if signed - forceCodeSigning: true + - target: "dmg" + arch: + - "universal" + identity: null appImage: executableArgs: - "--sandbox" diff --git a/main/package.json b/main/package.json index a49f21972..c3bfbb545 100644 --- a/main/package.json +++ b/main/package.json @@ -1,6 +1,6 @@ { "name": "awakened-poe-trade", - "version": "3.22.10004", + "version": "3.22.10005", "private": true, "scripts": { "dev": "node build/script.mjs", diff --git a/main/src/AppUpdater.ts b/main/src/AppUpdater.ts index e31f7033b..29b51bc20 100644 --- a/main/src/AppUpdater.ts +++ b/main/src/AppUpdater.ts @@ -34,7 +34,7 @@ export class AppUpdater { // https://www.electron.build/configuration/nsis.html#portable autoUpdater.autoDownload = !process.env.PORTABLE_EXECUTABLE_DIR - if (!autoUpdater.autoDownload) { + if (!autoUpdater.autoDownload || process.platform === 'darwin') { this.noAutoUpdatesReason = 'not-supported' } else if (process.argv.includes('--no-updates')) { autoUpdater.autoDownload = false