From 650c5888ac1fd9016da14eef83dc87e8a22f5ad0 Mon Sep 17 00:00:00 2001
From: Chris Wright <chris.wright@nanoporetech.com>
Date: Thu, 15 Aug 2024 10:13:22 +0100
Subject: [PATCH] more actions fiddling

---
 .github/workflows/python.yml | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
index 25d49f77..fdb413fc 100644
--- a/.github/workflows/python.yml
+++ b/.github/workflows/python.yml
@@ -5,11 +5,17 @@ on: [push, pull_request]
 jobs:
   build_wheels:
     name: Build wheels on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
+    runs-on: ${{ matrix.buildplat[0] }}
     strategy:
       matrix:
-        # macos-13 is an intel runner, macos-14 is apple silicon
-        os: [ubuntu-latest, macos-13, macos-14]
+        buildplat:
+          # doing as cibuildwheel docs says leads to frankenstein arm builds on macos
+          # so lets be more explicit
+          - [ubuntu-latest, manylinux_x86_64, auto]
+          # - [ubuntu-latest, manylinux_aarch64, auto]  # non-free on github
+          - [macos-latest, macosx_x86_64, x86_64]
+          - [macos-latest, macosx_arm64, arm64]
+          python: ["cp38", "cp39", "cp310", "cp11", "cp12"]
 
     steps:
       - uses: actions/checkout@v4
@@ -17,11 +23,12 @@ jobs:
       - name: Build wheels
         uses: pypa/cibuildwheel@v2.20.0
         env:
-          CIBW_BUILD: "cp38-* cp39-* cp310-* cp11-* cp12-*"
+          CIBW_ARCHS: ${{ matrix.buildplat[2] }}
+          CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}
 
       - uses: actions/upload-artifact@v4
         with:
-          name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
+          name: cibw-wheels-${{ matrix.python }}-${{ matrix.buildplat[1] }}
           path: ./wheelhouse/*.whl