From 7c17a2229857caf528450867e0b1bf69309bc828 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Sat, 10 Feb 2024 09:04:04 -0800 Subject: [PATCH 1/2] Test with aarch64 macOS on CI Rebase of #7129 with the `macos-14` string which GitHub indicates should now work for public repos. prtest:full --- .github/workflows/main.yml | 2 +- ci/build-build-matrix.js | 2 +- ci/build-test-matrix.js | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c3d8f8159862..cbc54e11092c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -514,7 +514,7 @@ jobs: if: matrix.os == 'ubuntu-latest' - name: CPU information run: sysctl hw - if: matrix.os == 'macos-latest' + if: contains(matrix.os, 'macos') - name: CPU information run: wmic cpu list /format:list shell: pwsh diff --git a/ci/build-build-matrix.js b/ci/build-build-matrix.js index 46c7e9bea20c..f0ca90ab0792 100644 --- a/ci/build-build-matrix.js +++ b/ci/build-build-matrix.js @@ -36,7 +36,7 @@ const array = [ }, { "build": "aarch64-macos", - "os": "macos-latest", + "os": "macos-14", "target": "aarch64-apple-darwin", }, { diff --git a/ci/build-test-matrix.js b/ci/build-test-matrix.js index b5b776fc78ee..b40d30fe45a3 100644 --- a/ci/build-test-matrix.js +++ b/ci/build-test-matrix.js @@ -59,6 +59,12 @@ const array = [ "name": "Test macOS x86_64", "filter": "macos-x64" }, + { + "os": "macos-14", + "name": "Test macOS arm64", + "filter": "macos-arm64" + "target": "aarch64-apple-darwin", + }, { "os": "windows-latest", "name": "Test Windows MSVC x86_64", From 6524153bec62365f62bdf8dda6d0b0b20428e042 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Sat, 10 Feb 2024 09:18:51 -0800 Subject: [PATCH 2/2] Fix syntax --- ci/build-test-matrix.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/build-test-matrix.js b/ci/build-test-matrix.js index b40d30fe45a3..0a2a53c9bde0 100644 --- a/ci/build-test-matrix.js +++ b/ci/build-test-matrix.js @@ -62,8 +62,8 @@ const array = [ { "os": "macos-14", "name": "Test macOS arm64", - "filter": "macos-arm64" - "target": "aarch64-apple-darwin", + "filter": "macos-arm64", + "target": "aarch64-apple-darwin" }, { "os": "windows-latest",