Merge pull request #2404 from lann/ci-mac-m1

ci: Run macos builds on M1

Author: lann

.github/workflows/build.yml

@@ -116,7 +116,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-latest, macos-latest]
+        os: [windows-latest, macos-14]
     steps:
       - uses: actions/checkout@v3
 
@@ -145,7 +145,7 @@ jobs:
     runs-on: ${{ matrix.runner }}
     strategy:
       matrix:
-        runner: [ubuntu-22.04-4core-spin, macos-latest]
+        runner: [ubuntu-22.04-4core-spin, macos-14]
     steps:
       - uses: actions/checkout@v3
 
@@ -165,7 +165,7 @@ jobs:
         run: |
           make test-integration
         # Only run integration tests on macOS as they will be run on ubuntu separately
-        if: ${{ matrix.runner == 'macos-latest' }}
+        if: ${{ matrix.runner == 'macos-14' }}
 
   all-integration-tests:
     # run on a larger runner for more SSD/resource access
@@ -228,21 +228,13 @@ jobs:
               targetDir: "target/aarch64-unknown-linux-gnu/release",
             }
           - {
-              os: "macos-latest",
-              arch: "amd64",
+              os: "macos-14",
+              arch: "aarch64",
               extension: "",
               extraArgs: "",
               target: "",
               targetDir: "target/release",
             }
-          - {
-              os: "macos-latest",
-              arch: "aarch64",
-              extension: "",
-              extraArgs: "--target aarch64-apple-darwin",
-              target: "aarch64-apple-darwin",
-              targetDir: "target/aarch64-apple-darwin/release/",
-            }
           - {
               os: "windows-latest",
               arch: "amd64",

.github/workflows/release.yml

@@ -44,20 +44,12 @@ jobs:
               targetDir: "target/aarch64-unknown-linux-gnu/release",
             }
           - {
-              os: "macos-latest",
-              arch: "amd64",
+              os: "macos-14",
+              arch: "aarch64",
               extension: "",
               extraArgs: "",
               target: "",
-              targetDir: "target/release",
-            }
-          - {
-              os: "macos-latest",
-              arch: "aarch64",
-              extension: "",
-              extraArgs: "--target aarch64-apple-darwin",
-              target: "aarch64-apple-darwin",
-              targetDir: "target/aarch64-apple-darwin/release/",
+              targetDir: "target/release/",
             }
           - {
               os: "windows-latest",