From 8ece8335373825e34fa575b7bd533a0d86865aac Mon Sep 17 00:00:00 2001
From: Kevin Longe <273747162+kvlonge@users.noreply.github.com>
Date: Wed, 28 Oct 2026 19:03:02 +0000
Subject: [PATCH 1/2] ci: pin the macOS arm64 runner to macos-15

---
 .github/workflows/ci.yml                  | 4 ++--
 .github/workflows/python-fork-release.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1036425c..1e5a1151 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -330,7 +330,7 @@ jobs:
           - target: x86_64-apple-darwin
             runner: macos-15-intel
           - target: aarch64-apple-darwin
-            runner: macos-latest
+            runner: macos-15
     steps:
       - uses: actions/checkout@v7
 
@@ -625,7 +625,7 @@ jobs:
             static_lib: libpolyglot_sql_ffi.a
             use_cross: false
             target_dir: target
-          - os: macos-latest
+          - os: macos-15
             target: aarch64-apple-darwin
             archive_name: macos-aarch64
             archive_ext: tar.gz
diff --git a/.github/workflows/python-fork-release.yml b/.github/workflows/python-fork-release.yml
index 697a855d..8a6ea383 100644
--- a/.github/workflows/python-fork-release.yml
+++ b/.github/workflows/python-fork-release.yml
@@ -72,7 +72,7 @@ jobs:
           - target: x86_64-apple-darwin
             runner: macos-15-intel
           - target: aarch64-apple-darwin
-            runner: macos-latest
+            runner: macos-15
     steps:
       - uses: actions/checkout@v7
 

From 8bdc27fa233202e9e1df2e5af8284672c30d664c Mon Sep 17 00:00:00 2001
From: Kevin Longe <273747162+kvlonge@users.noreply.github.com>
Date: Wed, 28 Oct 2026 20:30:04 +0000
Subject: [PATCH 2/2] ci: cross-compile the macOS arm64 wheel on the Intel
 runner

---
 .github/workflows/python-fork-release.yml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/python-fork-release.yml b/.github/workflows/python-fork-release.yml
index 8a6ea383..7f203bb0 100644
--- a/.github/workflows/python-fork-release.yml
+++ b/.github/workflows/python-fork-release.yml
@@ -71,8 +71,11 @@ jobs:
         include:
           - target: x86_64-apple-darwin
             runner: macos-15-intel
+            smoke: true
+          # Cross-compiled on the Intel runner: this repository gets no arm64 macOS runner.
           - target: aarch64-apple-darwin
-            runner: macos-15
+            runner: macos-15-intel
+            smoke: false
     steps:
       - uses: actions/checkout@v7
 
@@ -88,11 +91,18 @@ jobs:
           sccache: true
 
       - name: Smoke test wheel
+        if: matrix.smoke
         run: |
           ls dist/*-abi3-*.whl
           python -m pip install --no-index --find-links dist polyglot-sql-chio
           python -c "import polyglot_sql; assert polyglot_sql.parse_one('SELECT 1', dialect='postgres')"
 
+      - name: Check cross-compiled wheel
+        if: ${{ !matrix.smoke }}
+        run: |
+          ls dist/*-abi3-macosx_*_arm64.whl
+          unzip -l dist/*-abi3-macosx_*_arm64.whl | grep -q 'polyglot_sql/.*\.so$'
+
       - name: Upload wheel
         uses: actions/upload-artifact@v7
         with: