diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml index 52d6f9cd0..dae21d2df 100644 --- a/.github/workflows/build-binaries.yml +++ b/.github/workflows/build-binaries.yml @@ -118,11 +118,10 @@ jobs: # We want both arm64 and intel mac builds, and according to this https://docs.github.com/en/actions/using-github-hosted-runners/using-github-hosted-runners/about-github-hosted-runners#supported-runners-and-hardware-resources macos-14 and above is always arm64 and macos-13 is the last intel runner build_macos: + runs-on: macos-14 strategy: matrix: - os: [macos-14, macos-13] arch: [arm64, x64] - runs-on: ${{ matrix.os }} env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} MAC_CERTIFICATE: ${{ secrets.MAC_CERTIFICATE }} @@ -139,7 +138,7 @@ jobs: - name: Setup & Build uses: ./actions/setup_and_build with: - cache_suffix: ${{ matrix.os }}-${{ matrix.arch }} + cache_suffix: ${{ matrix.os }} # we want to test on all platforms since some are testing the rendered menus (and are dependent on the platform) - name: Unit Test diff --git a/actions/upload_prod_artefacts/action.yml b/actions/upload_prod_artefacts/action.yml index 2e9542f92..2a901b93b 100644 --- a/actions/upload_prod_artefacts/action.yml +++ b/actions/upload_prod_artefacts/action.yml @@ -16,7 +16,7 @@ runs: working-directory: ./release/ - name: Remaining files - run: ls . + run: ls . | grep ${{ matrix.arch }} shell: bash working-directory: ./release/ @@ -24,4 +24,7 @@ runs: uses: actions/upload-artifact@v4 with: name: ${{ inputs.upload_prefix }}-production - path: release + path: | + release/builder-debug.yml + release/latest-mac.yml + release/**/session-desktop-mac-${{ matrix.arch }} diff --git a/package.json b/package.json index 8936098a1..2cb833beb 100644 --- a/package.json +++ b/package.json @@ -227,8 +227,30 @@ "category": "public.app-category.social-networking", "icon": "build/icon-mac.icns", "target": [ - "dmg", - "zip" + { + "target": "dmg", + "arch": [ + "arm64" + ] + }, + { + "target": "zip", + "arch": [ + "arm64" + ] + }, + { + "target": "dmg", + "arch": [ + "x64" + ] + }, + { + "target": "zip", + "arch": [ + "x64" + ] + } ], "bundleVersion": "1", "hardenedRuntime": true,