From 2aa6d7683df0e2cb5ecc96a44f3a951b95ad829c Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Mon, 12 Feb 2024 10:10:42 -0600
Subject: [PATCH] Test with aarch64 macOS on CI (#7914)

* 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

* Fix syntax
---
 .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 c3d8f81598..cbc54e1109 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 46c7e9bea2..f0ca90ab07 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 b5b776fc78..0a2a53c9bd 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",