From a48909adee58a1c9e65f2cb97e6ad50e02f9ea6b Mon Sep 17 00:00:00 2001
From: Liam Keegan <liam@keegan.ch>
Date: Mon, 22 Apr 2024 10:03:00 +0200
Subject: [PATCH] Refactor CI

- set `platform` in CI instead of `skip`
- clearer logic than previous combination of build and skip filters
- label artifact uploads by `platform` and `arch` instead of job-id
- bump max cmake version
- use kebab case for gh-action-pypi-publish repository-url
---
 .github/workflows/release.yml | 21 +++++++++++----------
 CMakeLists.txt                |  2 +-
 pyproject.toml                |  3 ---
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 46d61fa..167d5e1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -25,13 +25,13 @@ env:
 
 jobs:
   build-wheels:
-    name: "${{ matrix.os }} :: ${{ matrix.arch }} (skip: ${{ matrix.skip }})"
+    name: "${{ matrix.os }} :: ${{ matrix.platform }}-${{ matrix.arch }}"
     runs-on: ${{ matrix.os }}
 
     strategy:
       matrix:
         arch: ["aarch64", "ppc64le", "s390x", "x86_64", "i686"]
-        skip: ["*manylinux*", "*musllinux*"]
+        platform: ["manylinux", "musllinux"]
         include:
           # initially generate all 10 matrix combinations with qemu on ubuntu:
           - os: ubuntu-latest
@@ -43,23 +43,23 @@ jobs:
           - os: ubuntu-latest
             arch: "i686"
             use_qemu: false
-          # additional runs (they define skip="" to ensure they cannot be combined with any matrix combinations)
+          # additional runs
           - os: windows-latest
+            platform: "win"
             arch: "AMD64"
             use_qemu: false
-            skip: ""
           - os: windows-latest
+            platform: "win"
             arch: "x86"
             use_qemu: false
-            skip: ""
           - os: macos-13
+            platform: "macos"
             arch: "x86_64"
             use_qemu: false
-            skip: ""
           - os: macos-14
+            platform: "macos"
             arch: "arm64"
             use_qemu: false
-            skip: ""
 
     steps:
     - uses: actions/checkout@v4
@@ -90,12 +90,13 @@ jobs:
       if: (!matrix.use_qemu) || fromJSON(env.USE_QEMU)
       env:
         CIBW_ARCHS: "${{ matrix.arch }}"
-        CIBW_SKIP: "${{ matrix.skip }}"
+        # restrict to a single Python version as wheel does not depend on Python:
+        CIBW_BUILD: "cp311-${{ matrix.platform }}*"
 
     - uses: actions/upload-artifact@v4
       if: (!matrix.use_qemu) || fromJSON(env.USE_QEMU)
       with:
-        name: artifacts-wheels-${{ strategy.job-index }}
+        name: artifacts-wheels-${{ matrix.platform }}-${{ matrix.arch }}
         path: ./wheelhouse/*.whl
 
   build-sdist:
@@ -177,4 +178,4 @@ jobs:
         uses: pypa/gh-action-pypi-publish@v1.8.14
         if: github.event.inputs.deploy_to_testpypi == 'true'
         with:
-          repository_url: https://test.pypi.org/legacy/
+          repository-url: https://test.pypi.org/legacy/
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e575341..6620aa2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16...3.28)
+cmake_minimum_required(VERSION 3.16...3.29)
 project(${SKBUILD_PROJECT_NAME} VERSION ${SKBUILD_PROJECT_VERSION})
 
 message(STATUS "clang-format-wheel version: ${SKBUILD_PROJECT_VERSION}")
diff --git a/pyproject.toml b/pyproject.toml
index 680bbda..d4f478d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -48,9 +48,6 @@ build-verbosity = 3
 # Set CMAKE_GENERATOR env var which is respected by scikit-build-core to use Ninja on all platforms
 environment = "CMAKE_GENERATOR=Ninja"
 
-# restrict to a single Python version as wheel does not depend on Python
-build = "cp39-*"
-
 # Testing commands for our wheels
 before-test = [
     "git config --global user.name Name",