.

Author: w1th0utnam3

.github/workflows/pysplashsurf_CI.yml

@@ -38,24 +38,20 @@ jobs:
           path: pysplashsurf/pysplashsurf/
 
   linux:
-    name: Build wheels ${{ matrix.platform.python-version }}
+    name: Build wheels ${{ matrix.python-version }}
     needs: generate-stub
-    runs-on: ${{ matrix.platform.runner }}
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
-        platform:
-          - runner: ubuntu-24.04
-            python-version: "manylinux_x86_64"
+        include:
+          - python-version: "manylinux_x86_64"
             archs: "x86_64"
-          - runner: ubuntu-24.04
-            python-version: "manylinux_i686"
+          - python-version: "manylinux_i686"
             archs: "i686"
-          - runner: ubuntu-24.04
-            python-version: "manylinux_aarch64"
+          - python-version: "manylinux_aarch64"
             archs: "aarch64"
-          - runner: ubuntu-24.04
-            python-version: "manylinux_armv7l"
+          - python-version: "manylinux_armv7l"
             archs: "armv7l"
     steps:
       - uses: actions/checkout@v4
@@ -79,8 +75,8 @@ jobs:
       - name: Build wheels
         run: python -m cibuildwheel --output-dir wheelhouse pysplashsurf
         env:
-            CIBW_BUILD: ${{ format('cp312-{0}', matrix.platform.python-version) }}
-            CIBW_ARCHS: ${{ matrix.platform.archs }}
+            CIBW_BUILD: ${{ format('cp312-{0}', matrix.python-version) }}
+            CIBW_ARCHS: ${{ matrix.archs }}
             CIBW_BEFORE_ALL: curl -sSf https://sh.rustup.rs | sh -s -- -y
             CIBW_ENVIRONMENT_LINUX: "PATH=$HOME/.cargo/bin:$PATH"
             CIBW_TEST_COMMAND: "cargo install --path {project}/splashsurf && pytest pysplashsurf/tests"
@@ -89,17 +85,17 @@ jobs:
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
-          name: wheels-${{ matrix.platform.python-version }}
+          name: wheels-${{ matrix.python-version }}
           path: wheelhouse
 
   macos:
-    name: Build wheels ${{ matrix.platform.python-version }}
+    name: Build wheels ${{ matrix.python-version }}
     needs: generate-stub
-    runs-on: ${{ matrix.platform.runner }}
+    runs-on: ${{ matrix.runner }}
     strategy:
       fail-fast: false
       matrix:
-        platform:
+        include:
           - runner: macos-13
             python-version: "macosx_x86_64"
             archs: "x86_64"
@@ -123,34 +119,32 @@ jobs:
       - name: Build wheels
         run: python -m cibuildwheel --output-dir wheelhouse pysplashsurf
         env:
-            CIBW_BUILD: ${{ format('cp312-{0}', matrix.platform.python-version) }}
-            CIBW_ARCHS: ${{ matrix.platform.archs }}
+            CIBW_BUILD: ${{ format('cp312-{0}', matrix.python-version) }}
+            CIBW_ARCHS: ${{ matrix.archs }}
             CIBW_BEFORE_ALL: curl -sSf https://sh.rustup.rs | sh -s -- -y
             CIBW_ENVIRONMENT_LINUX: "PATH=$HOME/.cargo/bin:$PATH"
             CIBW_ENVIRONMENT_MACOS: >-
-              PATH=$HOME/.cargo/bin:$PATH MACOSX_DEPLOYMENT_TARGET=${{ matrix.platform.macosx_deployment_target }}
+              PATH=$HOME/.cargo/bin:$PATH MACOSX_DEPLOYMENT_TARGET=${{ matrix.macosx_deployment_target }}
             CIBW_TEST_COMMAND: "cargo install --path {project}/splashsurf && pytest pysplashsurf/tests"
             CIBW_TEST_SOURCES: "pysplashsurf/tests"
             CIBW_TEST_REQUIRES: pytest meshio trimesh rtree scipy
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
-          name: wheels-${{ matrix.platform.python-version }}
+          name: wheels-${{ matrix.python-version }}
           path: wheelhouse
 
   windows:
-    name: Build wheels ${{ matrix.platform.python-version }}
+    name: Build wheels ${{ matrix.python-version }}
     needs: generate-stub
-    runs-on: ${{ matrix.platform.runner }}
+    runs-on: windows-latest
     strategy:
       fail-fast: false
       matrix:
-        platform:
-          - runner: windows-latest
-            archs: "AMD64"
+        include:
+          - archs: "AMD64"
             python-version: "win_amd64"
-          - runner: windows-latest
-            archs: "x86"
+          - archs: "x86"
             python-version: "win32"
     steps:
       - uses: actions/checkout@v4
@@ -167,20 +161,17 @@ jobs:
       - name: Build wheels
         run: python -m cibuildwheel --output-dir wheelhouse pysplashsurf
         env:
-            CIBW_BUILD: ${{ format('cp312-{0}', matrix.platform.python-version) }}
-            CIBW_ARCHS: ${{ matrix.platform.archs }}
+            CIBW_BUILD: ${{ format('cp312-{0}', matrix.python-version) }}
+            CIBW_ARCHS: ${{ matrix.archs }}
             CIBW_BEFORE_ALL: curl -sSf https://sh.rustup.rs | sh -s -- -y
-            CIBW_ENVIRONMENT_LINUX: "PATH=$HOME/.cargo/bin:$PATH"
-            CIBW_ENVIRONMENT_MACOS: >-
-              PATH=$HOME/.cargo/bin:$PATH MACOSX_DEPLOYMENT_TARGET=${{ matrix.platform.macosx_deployment_target }}
             # Tests are broken on Windows because trimesh library tries to write temporary files which fails
             #CIBW_TEST_COMMAND: "cargo install --path {project}/splashsurf && pytest pysplashsurf/tests"
             #CIBW_TEST_SOURCES: "pysplashsurf/tests"
             #CIBW_TEST_REQUIRES: pytest meshio trimesh rtree scipy
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
-          name: wheels-${{ matrix.platform.python-version }}
+          name: wheels-${{ matrix.python-version }}
           path: wheelhouse
 
   sdist: