From 26f037e41a83f567030d117b228df4f97eb5d00c Mon Sep 17 00:00:00 2001 From: yougotwill Date: Fri, 16 Aug 2024 16:52:44 +1000 Subject: [PATCH 1/4] feat: try to build apple silicon binaries added arm64 macos runner --- .github/workflows/build-binaries.yml | 4 ++-- .github/workflows/pull-request.yml | 2 +- .github/workflows/release.yml | 2 +- actions/setup_and_build/action.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml index bb10fc39d..924a1892a 100644 --- a/.github/workflows/build-binaries.yml +++ b/.github/workflows/build-binaries.yml @@ -22,7 +22,7 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-2022, macos-12, ubuntu-20.04] + os: [windows-2022, ubuntu-20.04, macos-12, macos-13-xlarge] env: SIGNAL_ENV: production GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -75,5 +75,5 @@ jobs: - name: Upload Production Artifacts uses: actions/upload-artifact@v1 with: - name: ${{ runner.OS }}-production + name: ${{ runner.os }}-${{ runner.arch }}-production path: release diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 68974bb15..d85c9e77d 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-2022, macos-12, ubuntu-20.04] + os: [windows-2022, ubuntu-20.04, macos-12, macos-13-xlarge] env: SIGNAL_ENV: production GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 905a21fe2..0c622602b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-2022, macos-12, ubuntu-20.04] + os: [windows-2022, ubuntu-20.04, macos-12, macos-13-xlarge] env: SIGNAL_ENV: production GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/actions/setup_and_build/action.yml b/actions/setup_and_build/action.yml index 3d33117d1..21e63ef33 100644 --- a/actions/setup_and_build/action.yml +++ b/actions/setup_and_build/action.yml @@ -19,7 +19,7 @@ runs: if: runner.os != 'Windows' with: path: node_modules - key: ${{ runner.os }}-${{ hashFiles('package.json', 'yarn.lock', 'patches/**') }} + key: ${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('package.json', 'yarn.lock', 'patches/**') }} # Not having this will break the windows build because the PATH won't be set by msbuild. - name: Add msbuild to PATH From cc3a0f14d3c1b30a4b9d4e5a83182efa91a0c3ce Mon Sep 17 00:00:00 2001 From: yougotwill Date: Fri, 16 Aug 2024 17:17:22 +1000 Subject: [PATCH 2/4] fix: use pr workflow in checks on gh for ci testing --- .github/workflows/build-binaries.yml | 2 ++ .github/workflows/pull-request.yml | 1 + 2 files changed, 3 insertions(+) diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml index 924a1892a..15b962f0b 100644 --- a/.github/workflows/build-binaries.yml +++ b/.github/workflows/build-binaries.yml @@ -7,11 +7,13 @@ on: - clearnet - unstable - release/ + - ci/ pull_request: branches: - clearnet - unstable - release/ + - ci/ concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: true diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index d85c9e77d..cf458d379 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -7,6 +7,7 @@ on: - clearnet - unstable - release/ + - ci/ concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} From 90617f1c6432ab1e196d3bfe3d702ce370c4ed1d Mon Sep 17 00:00:00 2001 From: yougotwill Date: Mon, 19 Aug 2024 10:52:08 +1000 Subject: [PATCH 3/4] fix: remove macos-13-xlarge from non release workflows --- .github/workflows/build-binaries.yml | 2 +- .github/workflows/pull-request.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml index 15b962f0b..63c42a04f 100644 --- a/.github/workflows/build-binaries.yml +++ b/.github/workflows/build-binaries.yml @@ -24,7 +24,7 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-2022, ubuntu-20.04, macos-12, macos-13-xlarge] + os: [windows-2022, ubuntu-20.04, macos-12] env: SIGNAL_ENV: production GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index cf458d379..b0924cfba 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-2022, ubuntu-20.04, macos-12, macos-13-xlarge] + os: [windows-2022, ubuntu-20.04, macos-12] env: SIGNAL_ENV: production GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 42d0ab14b707d186a978304efa7dc0515c90c299 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 20 Aug 2024 09:26:34 +1000 Subject: [PATCH 4/4] chore: test with macos-14-arm64 --- .github/workflows/build-binaries.yml | 3 ++- .github/workflows/pull-request.yml | 3 ++- .github/workflows/release.yml | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml index 63c42a04f..66fa53ba4 100644 --- a/.github/workflows/build-binaries.yml +++ b/.github/workflows/build-binaries.yml @@ -24,7 +24,8 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-2022, ubuntu-20.04, macos-12] + # We want a mac arm64 build, and according to this https://github.com/actions/runner-images#available-images macos-14 is always arm64 + os: [windows-2022, ubuntu-20.04, macos-12, macos-14] env: SIGNAL_ENV: production GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index b0924cfba..fa29f0bfe 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -19,7 +19,8 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-2022, ubuntu-20.04, macos-12] + # We want a mac arm64 build, and according to this https://github.com/actions/runner-images#available-images macos-14 is always arm64 + os: [windows-2022, ubuntu-20.04, macos-12, macos-14] env: SIGNAL_ENV: production GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0c622602b..06a6a9214 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,7 +12,8 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-2022, ubuntu-20.04, macos-12, macos-13-xlarge] + # We want a mac arm64 build, and according to this https://github.com/actions/runner-images#available-images macos-14 is always arm64 + os: [windows-2022, ubuntu-20.04, macos-12, macos-14] env: SIGNAL_ENV: production GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}