From fef94eb7066acb4e26fca28fd4ed88d83f30f480 Mon Sep 17 00:00:00 2001
From: Austin Schneider <hogenshpogen@gmail.com>
Date: Wed, 29 May 2024 04:50:56 -0500
Subject: [PATCH] Try new runner strategy

---
 .github/workflows/build_wheels.yml | 57 ++++++++----------------------
 1 file changed, 14 insertions(+), 43 deletions(-)

diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
index 63b29d25..76d0b9e8 100644
--- a/.github/workflows/build_wheels.yml
+++ b/.github/workflows/build_wheels.yml
@@ -1,60 +1,31 @@
 name: Build
 
-on: [pull_request]
+on: [push, pull_request]
 
 jobs:
-  build_wheels_linux:
+  build_wheels:
     name: Build wheels on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04]
-        arch: [x86_64, i686, aarch64, ppc64le, s390x]
+        # macos-13 is an intel runner, macos-14 is apple silicon
+        os: [ubuntu-latest, windows-latest, macos-13, macos-14]
 
     steps:
-      - name: Checkout SIREN
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
 
-      - name: Setup Python
-        uses: actions/setup-python@v5
+      - name: Set up QEMU
+        if: runner.os == 'Linux'
+        uses: docker/setup-qemu-action@v3
         with:
-          python-version: '3.9'  # update once build dependencies are available
+          platforms: all
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.16.2
-
-      - name: Setup tmate session
-        if: ${{ failure() }}
-        uses: mxschmitt/action-tmate@v3
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
-          path: ./wheelhouse/*.whl
-  build_wheels_macos:
-    name: Build wheels on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [macos-11]
-        # arch: [x86_64, arm64]
-        arch: [x86_64]
-
-    steps:
-      - name: Checkout SIREN
-        uses: actions/checkout@v4
-
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.9'  # update once build dependencies are available
-
-      - name: Build wheels
-        uses: pypa/cibuildwheel@v2.16.2
-
-      - name: Setup tmate session
-        if: ${{ failure() }}
-        uses: mxschmitt/action-tmate@v3
+        uses: pypa/cibuildwheel@v2.18.1
+        env:
+          # configure cibuildwheel to build native archs ('auto'), and some
+          # emulated ones
+          CIBW_ARCHS_LINUX: auto aarch64 ppc64le s390x
 
       - uses: actions/upload-artifact@v4
         with: