fix: only use one runner but a matrix strategy for each architecture

we then filter the artefects per architecture when uploading
pull/3281/head
yougotwill 3 months ago
parent e0e199375a
commit a7cd275ef1

@ -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

@ -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 }}

@ -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,

Loading…
Cancel
Save