From 52f5839b8e9d265caa83bedf7fc864094f698de4 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Fri, 17 Jan 2025 09:05:54 -1000
Subject: [PATCH] Migrate to using native ARM runners for wheel builds

---
 .github/workflows/release.yml | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b979f40b..ae6806be 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,29 +13,35 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-22.04]
+        os:
+          [
+            ubuntu-24.04-arm,
+            ubuntu-latest,
+            macos-13,
+            macos-latest,
+          ]
+        musl: ["", "musllinux"]
+        exclude:
+          - os: macos-13
+            musl: "musllinux"
+          - os: macos-latest
+            musl: "musllinux"
 
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set up QEMU
-        if: runner.os == 'Linux'
-        uses: docker/setup-qemu-action@v3
-        with:
-          platforms: arm64
-
       - name: Build wheels
         uses: pypa/cibuildwheel@v2.22.0
         env:
-          CIBW_SKIP: cp36-* cp37-* cp38-* cp39-* cp310-* pp* *musllinux*
+          CIBW_SKIP: cp36-* cp37-* cp38-* cp39-* cp310-* pp* ${{ matrix.musl == 'musl' && '*manylinux*' || '*musllinux*' }}
           CIBW_BEFORE_ALL_LINUX: apt-get install -y gcc || yum install -y gcc || apk add gcc
+          CIBW_ARCHS_LINUX: ${{ matrix.os == 'ubuntu-24.04-arm' && 'aarch64' || 'auto' }}
           CIBW_BUILD_VERBOSITY: 3
-          CIBW_ARCHS_LINUX: auto aarch64
           REQUIRE_CYTHON: 1
 
       - uses: actions/upload-artifact@v4
         with:
-          name: wheels
+          name: wheels-${{ matrix.os }}-${{ matrix.musl }}
           path: ./wheelhouse/*.whl
 
   build_sdist: