From 0d582fde46c7d454a35816024c5af49757a2e13c Mon Sep 17 00:00:00 2001 From: omove <61330514+omove@users.noreply.github.com> Date: Sat, 23 Nov 2024 22:30:25 -0500 Subject: [PATCH 1/3] Update macos-release-build.yml Signed-off-by: omove <61330514+omove@users.noreply.github.com> --- .github/workflows/macos-release-build.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/macos-release-build.yml b/.github/workflows/macos-release-build.yml index 749ef4430..d3bbcace6 100644 --- a/.github/workflows/macos-release-build.yml +++ b/.github/workflows/macos-release-build.yml @@ -15,15 +15,11 @@ jobs: mac-build: name: Build macOS - ${{ matrix.arch }} - runs-on: ${{ matrix.os }} + runs-on: macos-latest strategy: fail-fast: false matrix: - include: - - arch: aarch64 - os: macos-14 - - arch: x86_64 - os: macos-13 + arch: [x86_64, aarch64] steps: - name: Install Node.js From 9abae121fc1f74709f803f386e3c95692c5f1a92 Mon Sep 17 00:00:00 2001 From: omove <61330514+omove@users.noreply.github.com> Date: Sat, 23 Nov 2024 22:44:16 -0500 Subject: [PATCH 2/3] Update macos-release-build.yml Signed-off-by: omove <61330514+omove@users.noreply.github.com> --- .github/workflows/macos-release-build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/macos-release-build.yml b/.github/workflows/macos-release-build.yml index d3bbcace6..0e11d60ef 100644 --- a/.github/workflows/macos-release-build.yml +++ b/.github/workflows/macos-release-build.yml @@ -73,6 +73,12 @@ jobs: brew install watchman curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.79 + source $HOME/.cargo/env + if test "${{ matrix.arch }}" = "aarch64"; then + rustup target add aarch64-apple-darwin + else + rustup target add x86_64-apple-darwin + fi - name: Force usage fo gnu-tar run: | From 1cd3f5c615cfd6119bbe17f5cb51262d28a0bc4d Mon Sep 17 00:00:00 2001 From: omove <61330514+omove@users.noreply.github.com> Date: Sun, 24 Nov 2024 01:09:20 -0500 Subject: [PATCH 3/3] Update macos-release-build.yml Signed-off-by: omove <61330514+omove@users.noreply.github.com> --- .github/workflows/macos-release-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos-release-build.yml b/.github/workflows/macos-release-build.yml index 0e11d60ef..c72c4679f 100644 --- a/.github/workflows/macos-release-build.yml +++ b/.github/workflows/macos-release-build.yml @@ -15,7 +15,7 @@ jobs: mac-build: name: Build macOS - ${{ matrix.arch }} - runs-on: macos-latest + runs-on: macos-14 strategy: fail-fast: false matrix: