Use native runners for both macOS architectures instead of cross-compiling

macos-latest now points to Apple Silicon, so the old --arch arm64
cross-compile produced a duplicate arm64 binary while darwin-x64 was
quietly missing from releases.

Replace the cross-compile approach with native builds on macos-13 (x64)
and macos-latest (arm64). Also add macos-13 to the PR test matrices so
both architectures are tested.

Author: oetr

.github/workflows/release.yaml

@@ -13,11 +13,12 @@ jobs:
       contents: read
     strategy:
       matrix:
-        os: [ubuntu-latest, ubuntu-24.04-arm, macos-latest, windows-latest]
-        opts: [""]
-        include:
-          - os: macos-latest
-            opts: "--arch arm64"
+        os:
+          - ubuntu-latest
+          - ubuntu-24.04-arm
+          - macos-13 # x64
+          - macos-latest # arm64
+          - windows-latest
     runs-on: ${{ matrix.os }}
     steps:
       - name: checkout
@@ -34,13 +35,12 @@ jobs:
         run: npm ci
       - name: build
         run: |
-          npm run prebuild --workspace=@jazzer.js/fuzzer -- ${{ matrix.opts }}
-          npm run build --workspace=@jazzer.js/fuzzer -- ${{ matrix.opts }}
+          npm run prebuild --workspace=@jazzer.js/fuzzer
+          npm run build --workspace=@jazzer.js/fuzzer
       - name: upload
         uses: actions/upload-artifact@v4
         with:
-          name:
-            native-addon-${{ matrix.os }}${{ matrix.opts && '-arm64' || '' }}
+          name: native-addon-${{ matrix.os }}
           path: packages/fuzzer/prebuilds
           if-no-files-found: error
 

.github/workflows/run-all-tests-pr.yaml

@@ -42,7 +42,14 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-latest, ubuntu-latest, macos-latest, ubuntu-24.04-arm]
+        os:
+          [
+            windows-latest,
+            ubuntu-latest,
+            ubuntu-24.04-arm,
+            macos-13,
+            macos-latest,
+          ]
         node: [20]
         include:
           # Node 14 runtime compatibility is covered by end-to-end tests.
@@ -85,7 +92,14 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest, ubuntu-24.04-arm]
+        os:
+          [
+            ubuntu-latest,
+            ubuntu-24.04-arm,
+            macos-13,
+            macos-latest,
+            windows-latest,
+          ]
     steps:
       - name: checkout
         uses: actions/checkout@v4
@@ -107,13 +121,18 @@ jobs:
 
       # Run with different node.js versions
       # all in one job to avoid rebuilding
+      # Node 14 only has binaries for x64 runners
       - name: "node 14"
-        if: matrix.os != 'macos-latest' && matrix.os != 'ubuntu-24.04-arm'
+        if: >-
+          matrix.os == 'ubuntu-latest' || matrix.os == 'macos-13' || matrix.os
+          == 'windows-latest'
         uses: actions/setup-node@v4
         with:
           node-version: 14
       - name: run tests (node 14)
-        if: matrix.os != 'macos-latest' && matrix.os != 'ubuntu-24.04-arm'
+        if: >-
+          matrix.os == 'ubuntu-latest' || matrix.os == 'macos-13' || matrix.os
+          == 'windows-latest'
         run: cd end-to-end && npx jest
         shell: bash