Create a single matrix for all builds

Author: Martijn Jacobs

.github/workflows/wheels.yml

@@ -18,85 +18,51 @@ on:
         type: string
 
 jobs:
-  build-native:
+  build:
     strategy:
       matrix:
         t:
           - os: ubuntu-24.04
-            target: x86_64-unknown-linux-gnu
             arch: x64
+            target: x86_64-unknown-linux-gnu
+            test: native
+
           - os: ubuntu-24.04-arm
-            target: aarch64-unknown-linux-gnu
             arch: arm64
+            target: aarch64-unknown-linux-gnu
+            test: native
             # see https://github.com/astral-sh/ruff/issues/3791
             # and https://github.com/gnzlbg/jemallocator/issues/170#issuecomment-1503228963
             maturin_docker_options: -e JEMALLOC_SYS_WITH_LG_PAGE=16
 
           # The macos-15-intel runner still supports x64, see https://github.com/actions/runner-images/issues/13045
           - os: macos-15-intel
-            target: x86_64
             arch: x64
+            target: x86_64
+            test: native
           - os: macos-latest
-            target: aarch64
             arch: arm64
+            target: aarch64
+            test: native
 
           - os: windows-2022
-            target: x86_64-pc-windows-msvc
             arch: x64
+            target: x86_64-pc-windows-msvc
           - os: windows-2022
-            target: i686-pc-windows-msvc
             arch: x86
-    runs-on: ${{ matrix.t.os }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
-          persist-credentials: false
-      - uses: actions/setup-python@v5
-        with:
-          python-version: ${{ inputs.python_version }}
-          architecture: ${{ matrix.t.arch || env.DEFAULT_ARCH }}
-      - uses: Swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3
-        with:
-          # The target is needed, because there were issues when reusing
-          # caches, probably related to cross compiling.
-          key: "swatinem-${{ matrix.t.target }}"
-      - name: "Pre-Build"
-        run: ./pre-maturin-build.sh
-      - name: "Build Wheel"
-        uses: PyO3/maturin-action@v1
-        with:
-          target: ${{ matrix.t.target }}
-          working-directory: ${{ env.DEPLOY_DIR }}
-          docker-options: ${{ matrix.t.maturin_docker_options }}
-          manylinux: auto
-          args: --release --locked --out dist --ignore-rust-version
-      - name: "Test wheel"
-        run: ./test-maturin-build.sh
-      - name: "Upload wheel as a GitHub Artifact"
-        uses: actions/upload-artifact@v4
-        with:
-          name: wheels-${{ matrix.t.os }}-${{ matrix.t.target }}
-          path: "${{ env.DEPLOY_DIR }}/dist"
+            target: i686-pc-windows-msvc
+            test: native
 
-  build-cross:
-    strategy:
-      matrix:
-        t:
-          # manylinux armv7
+          # manylinux armv7 / x86 (i686)
           - os: ubuntu-24.04
             arch: armv7
             target: armv7-unknown-linux-gnueabihf
-            manylinux: auto
             test: run-on-arch
             distro: ubuntu24.04
             install_cmd: apt-get update && apt-get install -y python3 python3-pip python3-venv
-
-          # manylinux x86 (i686)
           - os: ubuntu-24.04
             arch: x86
             target: i686-unknown-linux-gnu
-            manylinux: auto
             test: container
             image: i386/python:${{ inputs.python_version }}-slim-trixie
             install_cmd: apt-get install -y bash
@@ -130,7 +96,6 @@ jobs:
             test: container
             image: i386/python:${{ inputs.python_version }}-alpine
             install_cmd: apk add bash
-
     runs-on: ${{ matrix.t.os }}
     steps:
       - uses: actions/checkout@v4
@@ -150,8 +115,16 @@ jobs:
           target: ${{ matrix.t.target }}
           working-directory: ${{ env.DEPLOY_DIR }}
           docker-options: ${{ matrix.t.maturin_docker_options }}
-          manylinux: ${{ matrix.t.manylinux }}
+          manylinux: ${{ matrix.t.manylinux || 'auto' }}
           args: --release --locked --out dist --ignore-rust-version
+      - uses: actions/setup-python@v5
+        if: matrix.t.test == 'native'
+        with:
+          python-version: ${{ inputs.python_version }}
+          architecture: ${{ matrix.t.arch || env.DEFAULT_ARCH }}
+      - name: "Test wheel (native)"
+        if: matrix.t.test == 'native'
+        run: ./test-maturin-build.sh
       - name: "Test wheel (run-on-arch)"
         if: matrix.t.test == 'run-on-arch'
         uses: uraimo/run-on-arch-action@v3