CI: update script to generate multiple wheels per job

AlexyPellegrini · AlexyPellegrini · commit bd0dd0c7c16a · 2026-03-03T16:31:23.000+01:00
diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml
@@ -12,16 +12,12 @@ on:
         description: 'VTK version to use, must match the one in pyproject.toml'
         required: true
         type: string
-      python-version:
-        description: 'Python version to set up (e.g., 3.10)'
-        required: true
-        type: string
-      build-target:
+      build-targets:
         description: 'CIBW build target (e.g., cp310-manylinux_x86_64)'
         required: true
         type: string
-      wheel-tag:
-        description: 'Wheel tag to apply after building. Ignored on Windows.'
+      platform-tag:
+        description: 'Wheel platform tag to apply after building. Ignored on Windows.'
         required: true
         type: string
       macosx-deployment-target:
@@ -46,7 +42,7 @@ jobs:
     
     env:
       MACOSX_DEPLOYMENT_TARGET: ${{ inputs.macosx-deployment-target }}
-      CIBW_BUILD: ${{ inputs.build-target }}
+      CIBW_BUILD: ${{ inputs.build-targets }}
       # cibuildwheel creates a docker container for building our wheel
       # This is all the required steps to use host ccache correctly
       # Note that this is only needed on linux, as Mac and Windows do not use docker containers
@@ -69,11 +65,11 @@ jobs:
       # SlicerCore uses extensive CMake logic to package everything as needed, do not try this at home!
       CIBW_REPAIR_WHEEL_COMMAND_LINUX: "
         python -m pip install wheel &&
-        python -m wheel tags --platform-tag ${{ inputs.wheel-tag }} --remove {wheel} &&
+        python -m wheel tags --platform-tag ${{ inputs.platform-tag }} --remove {wheel} &&
         cp $(dirname {wheel})/slicer_core*.whl {dest_dir}"
       CIBW_REPAIR_WHEEL_COMMAND_MACOS: "
         python -m pip install wheel &&
-        python -m wheel tags --platform-tag ${{ inputs.wheel-tag }} --remove {wheel} &&
+        python -m wheel tags --platform-tag ${{ inputs.platform-tag }} --remove {wheel} &&
         cp $(dirname {wheel})/slicer_core*.whl {dest_dir}"
 
     steps:
@@ -122,14 +118,6 @@ jobs:
     - uses: ilammy/msvc-dev-cmd@v1.13.0
       if: ${{ !inputs.dry-run }}
 
-    - name: Set up Python ${{ inputs.python-version }}
-      if: ${{ !inputs.dry-run }}
-      uses: actions/setup-python@v5
-      with:
-        python-version: ${{ inputs.python-version }}
-        cache: 'pip'
-        cache-dependency-path: 'pyproject.toml'
-
     - name: Apply patch
       if: ${{ !inputs.dry-run }}
       run: python apply_patch.py && python set_vtk_version.py ${{ inputs.vtk-tag }}
@@ -147,15 +135,15 @@ jobs:
       if: ${{ inputs.dry-run && runner.os != 'Windows' }}
       run: |
         mkdir wheelhouse
-        zip wheelhouse/slicer_core-0.0.1-${{ inputs.python-version }}-${{ inputs.wheel-tag }}.whl README.md
-        zip wheelhouse/slicer_core_sdk-0.0.1-${{ inputs.python-version }}-${{ inputs.wheel-tag }}.whl README.md
+        zip wheelhouse/slicer_core-0.0.1-${{ inputs.platform-tag }}.whl README.md
+        zip wheelhouse/slicer_core_sdk-0.0.1-${{ inputs.platform-tag }}.whl README.md
 
     - name: Dry-run create wheels
       if: ${{ inputs.dry-run && runner.os == 'Windows' }}
       run: |
         mkdir wheelhouse
-        Compress-Archive -Path README.md -DestinationPath wheelhouse/slicer_core-0.0.1-${{ inputs.python-version }}-${{ inputs.wheel-tag }}.whl
-        Compress-Archive -Path README.md -DestinationPath wheelhouse/slicer_core_sdk-0.0.1-${{ inputs.python-version }}-${{ inputs.wheel-tag }}.whl
+        Compress-Archive -Path README.md -DestinationPath wheelhouse/slicer_core-0.0.1-${{ inputs.platform-tag }}.whl
+        Compress-Archive -Path README.md -DestinationPath wheelhouse/slicer_core_sdk-0.0.1-${{ inputs.platform-tag }}.whl
 
     - name: ccache stats (after Runtime build)
       if: ${{ inputs.use-cache && !inputs.dry-run }}
@@ -164,7 +152,7 @@ jobs:
     - name: Upload wheel artifact
       uses: actions/upload-artifact@v4
       with:
-        name: slicer_core-${{ inputs.python-version }}-${{ inputs.build-target }}
+        name: slicer_core-${{ matrix.os }}
         path: wheelhouse/slicer_core-*.whl
 
     - name: Build wheel SDK
@@ -183,7 +171,7 @@ jobs:
     - name: Upload wheel SDK artifact
       uses: actions/upload-artifact@v4
       with:
-        name: slicer_core_sdk-${{ inputs.python-version }}-${{ inputs.build-target }}
+        name: slicer_core_sdk-${{ matrix.os }}
         path: wheelhouse/slicer_core_sdk-*.whl
 
     - name: Save ccache
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -9,37 +9,23 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-15]
         vtk-tag: ['9.6.0']
-        python-version: ['3.10', '3.11', '3.12', '3.13']
-        include:
-          # Python version to CPython abi tag
-          - python-version: '3.10'
-            cp-tag: 'cp310'
-          - python-version: '3.11'
-            cp-tag: 'cp311'
-          - python-version: '3.12'
-            cp-tag: 'cp312'
-          - python-version: '3.13'
-            cp-tag: 'cp313'
-          # OS name to ciwheelbuild platform name
+        include: # OS name to ciwheelbuild platform name
           - os: ubuntu-latest
-            platform-tag: manylinux_x86_64
-            wheel-tag: manylinux_2_28_x86_64
+            platform-tag: manylinux_2_28_x86_64
+            build-targets: "cp310-manylinux_x86_64 cp311-manylinux_x86_64 cp312-manylinux_x86_64 cp313-manylinux_x86_64"
           - os: windows-latest
             platform-tag: win_amd64
-            wheel-tag: win_amd64
+            build-targets: "cp310-win_amd64 cp311-win_amd64 cp312-win_amd64 cp313-win_amd64"
           - os: macos-15
-            platform-tag: macosx_arm64
-            wheel-tag: macosx_11_0_arm64
+            platform-tag: macosx_11_0_arm64
+            build-targets: "cp310-macosx_arm64 cp311-macosx_arm64 cp312-macosx_arm64 cp313-macosx_arm64"
     uses: ./.github/workflows/build-wheels.yml
     with:
-      # Map the matrix variables to the reusable workflow's inputs
       os: ${{ matrix.os }}
       vtk-tag: ${{ matrix.vtk-tag }}
-      python-version: ${{ matrix.python-version }}
-      build-target: ${{ matrix.cp-tag }}-${{ matrix.platform-tag }}
-      wheel-tag: ${{ matrix.wheel-tag }}
-      use-cache: true
-      dry-run: true
+      build-targets: ${{ matrix.build-targets }}
+      platform-tag: ${{ matrix.platform-tag }}
+      macosx-deployment-target: "11.0"
 
   upload-github:
     name: Push SlicerCore release on github
@@ -61,12 +47,12 @@ jobs:
       - name: Show downloaded wheels
         run: ls ./wheelhouse
 
-      #- name: Publish Release and Attach Wheels
-      #  uses: softprops/action-gh-release@v2
-      #  with:
-      #    generate_release_notes: true 
-      #    # Attach all the downloaded wheels to the GitHub Release page
-      #    files: ./wheelhouse/*.whl
+      - name: Publish Release and Attach Wheels
+        uses: softprops/action-gh-release@v2
+        with:
+          generate_release_notes: true
+          # Attach all the downloaded wheels to the GitHub Release page
+          files: ./wheelhouse/*.whl
     
 
   upload-pypi:
@@ -95,7 +81,7 @@ jobs:
         run: ls ./wheelhouse
 
       # https://docs.pypi.org/trusted-publishers/using-a-publisher/
-      #- name: Publish package distributions to PyPI
-      #  uses: pypa/gh-action-pypi-publish@release/v1
-      #  with:
-      #      packages-dir: ./wheelhouse
+      - name: Publish package distributions to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+            packages-dir: ./wheelhouse
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,30 +10,21 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest, windows-latest, macos-15]
-        vtk-tag: ['9.6.0'] # pyproject enforces this specific version
-        python-version: ['3.10']
-        include:
-          # Python version to CPython abi tag
-          - python-version: '3.10'
-            cp-tag: 'cp310'
-          # OS name to ciwheelbuild platform name
+        vtk-tag: ['9.6.0']
+        include: # OS name to ciwheelbuild platform name
           - os: ubuntu-latest
-            platform-tag: manylinux_x86_64
-            wheel-tag: manylinux_2_28_x86_64
+            platform-tag: manylinux_2_28_x86_64
+            build-targets: "cp310-manylinux_x86_64"
           - os: windows-latest
             platform-tag: win_amd64
-            wheel-tag: win_amd64
+            build-targets: "cp310-win_amd64"
           - os: macos-15
-            platform-tag: macosx_arm64
-            wheel-tag: macosx_11_0_arm64
-            macosx-deployment-target: "11.0"
+            platform-tag: macosx_11_0_arm64
+            build-targets: "cp310-macosx_arm64"
     uses: ./.github/workflows/build-wheels.yml
     with:
-      # Map the matrix variables to the reusable workflow's inputs
       os: ${{ matrix.os }}
       vtk-tag: ${{ matrix.vtk-tag }}
-      python-version: ${{ matrix.python-version }}
-      build-target: ${{ matrix.cp-tag }}-${{ matrix.platform-tag }}
-      wheel-tag: ${{ matrix.wheel-tag }}
-      use-cache: true
-      dry-run: true
+      build-targets: ${{ matrix.build-targets }}
+      platform-tag: ${{ matrix.platform-tag }}
+      macosx-deployment-target: "11.0"
