From ab5a12b8010d6b802ffd31436dd87826f6ff2347 Mon Sep 17 00:00:00 2001
From: Andrew Hankinson <andrew.hankinson@gmail.com>
Date: Tue, 7 May 2024 14:44:31 +0200
Subject: [PATCH] Update GH for python wheels (second version)

---
 .github/workflows/python-ci-wheel.yml | 47 ++++++++++-----------------
 1 file changed, 18 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/python-ci-wheel.yml b/.github/workflows/python-ci-wheel.yml
index 3f42b9a57ab..1c0520f7069 100644
--- a/.github/workflows/python-ci-wheel.yml
+++ b/.github/workflows/python-ci-wheel.yml
@@ -23,25 +23,16 @@ jobs:
       fail-fast: false
       # Build the wheels for Linux, Windows and macOS
       matrix:
-        os: [macos-13, windows-latest, ubuntu-latest]
+        os: [macos-13, macos-14, windows-latest, ubuntu-latest]
         python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
-        architecture: [x86, x64]
+        architecture: [x86, x64, arm64]
         include:
           - os: macos-13
             architecture: x64
-            platform_id: macosx_*
-          # - os: macos-14
-          #   architecture: arm64
-          #   platform_id: macosx_*
-          #   python-version: "3.10"
-          # - os: macos-14
-          #   architecture: arm64
-          #   platform_id: macosx_*
-          #   python-version: "3.11"
-          # - os: macos-14
-          #   architecture: arm64
-          #   platform_id: macosx_*
-          #   python-version: "3.12"
+            platform_id: macosx_x86_64
+          - os: macos-14
+            architecture: arm64
+            platform_id: macosx_arm64
           - os: windows-latest
             architecture: x64
             platform_id: win_amd64
@@ -54,18 +45,18 @@ jobs:
         exclude:
           - os: macos-13
             architecture: x86
+          - os: macos-13
+            architecture: arm64
+          - os: macos-14
+            architecture: x86
+          - os: macos-14
+            architecture: x64
           - os: ubuntu-latest
             architecture: x86
-          # - os: macos-14
-          #   architecture: "x86"
-          # - os: macos-14
-          #   architecture: "x64"
-          # - os: macos-14
-          #   python-version: "3.8"
-          # - os: macos-14
-          #   python-version: "3.9"
-          # - os: macos-14
-          #   python-version: "3.10"
+          - os: ubuntu-latest
+            architecture: arm64
+          - os: windows-latest
+            architecture: arm64
 
     steps:
       #===============================================#
@@ -109,12 +100,10 @@ jobs:
         with:
           output-dir: wheelhouse
         env:
-          CIBW_SKIP: cp37-macosx_arm64
           CIBW_BUILD: ${{ env.CIBW_BUILD_IDENTIFIER }}
           CIBW_ARCHS_MACOS: x86_64 arm64
           CIBW_ENVIRONMENT_MACOS:
             MACOSX_DEPLOYMENT_TARGET=10.15
-          # CIBW_TEST_SKIP: cp*-macosx_arm64
           CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
           CIBW_MANYLINUX_I686_IMAGE: manylinux2014
           CIBW_BEFORE_ALL_MACOS: brew update && brew install swig
@@ -142,7 +131,7 @@ jobs:
       - name: Install from wheel on macOS
         working-directory: wheelhouse
         if: always() && runner.os == 'macOS'
-        run: python -m pip install ./*x86_64.whl
+        run: python -m pip install ./*.whl
 
       # Wildcard use is different with PowerShell
       # cf. https://stackoverflow.com/a/43900040
@@ -159,7 +148,7 @@ jobs:
       # Upload artifacts
       - uses: actions/upload-artifact@v3
         with:
-          name: cibuildwheel-${{ runner.os }}-python-${{ matrix.python-version }}
+          name: cibuildwheel-${{ runner.os }}-python-${{ matrix.python-version }}-${{ matrix.architecture }}
           path: ./wheelhouse/*.whl
 
   #===============================================#