🧪 Generalize cibuildwheel config w/ env vars

Author: webknjaz

.github/workflows/ci-cd.yml

@@ -142,22 +142,26 @@ jobs:
     with:
       check-name: >-
         Build ${{ matrix.tag }} wheels on ${{ matrix.runner-vm-os }}
-      wheel-tags-to-skip: >-
-        ${{
-        (github.event_name != 'push' || !contains(github.ref, 'refs/tags/'))
-        && '*_i686
-        *-macosx_universal2
-        *-musllinux_*
-        *-win32
-        pp*'
-        || (matrix.tag == 'musllinux') && '*-manylinux_* pp*'
-        || '*-musllinux_* pp*'
-        }}
       runner-vm-os: ${{ matrix.runner-vm-os }}
       timeout-minutes: 15
       source-tarball-name: >-
         ${{ needs.build-pure-python-dists.outputs.sdist-filename }}
       dists-artifact-name: ${{ needs.pre-setup.outputs.dists-artifact-name }}
+      environment-variables: |-
+        CIBW_ARCHS_MACOS=x86_64 arm64 universal2
+
+        CIBW_SKIP<<EOF
+        ${{
+          (github.event_name != 'push' || !contains(github.ref, 'refs/tags/'))
+          && '*_i686
+          *-macosx_universal2
+          *-musllinux_*
+          *-win32'
+          || (matrix.tag == 'musllinux') && '*-manylinux_*'
+        || '*-musllinux_*'
+        }}
+        pp*
+        EOF
 
   test:
     name: >-
@@ -565,17 +569,22 @@ jobs:
     with:
       check-name: >-
         Build ${{ matrix.tag }} wheels for ${{ matrix.qemu }}
-      qemu: ${{ matrix.qemu }}
-      wheel-tags-to-skip: >-
-        ${{
-        (matrix.tag == 'musllinux')
-        && '*-manylinux_* pp*'
-        || '*-musllinux_* pp*'
-        }}
+      qemu: true
       timeout-minutes: 120
       source-tarball-name: >-
         ${{ needs.build-pure-python-dists.outputs.sdist-filename }}
       dists-artifact-name: ${{ needs.pre-setup.outputs.dists-artifact-name }}
+      # CIBW_ARCHS_LINUX: Build emulated architectures if QEMU, else "auto"
+      environment-variables: |-
+        CIBW_ARCHS_LINUX=${{ matrix.qemu }}
+
+        CIBW_ARCHS_MACOS=x86_64 arm64 universal2
+
+        CIBW_SKIP=${{
+          (matrix.tag == 'musllinux')
+          && '*-manylinux_*'
+          || '*-musllinux_*'
+        }} pp*
 
   deploy:
     name: Deploy

.github/workflows/reusable-cibuildwheel.yml

@@ -13,11 +13,19 @@ on:  # yamllint disable-line rule:truthy
         description: A custom name for the Checks API-reported status
         required: false
         type: string
-      qemu:
-        description: Emulated QEMU architecture
-        default: ''
+      environment-variables:
+        description: >-
+          A newline-delimited blob of text with environment variables
+          to be set using `${GITHUB_ENV}`
         required: false
         type: string
+      qemu:
+        default: false
+        description: >-
+          Whether this job needs to configure QEMU to emulate a foreign
+          architecture before running `cibuildwheel`. Defaults to "false".
+        required: false
+        type: boolean
       runner-vm-os:
         description: VM OS to use
         default: ubuntu-latest
@@ -31,11 +39,6 @@ on:  # yamllint disable-line rule:truthy
         description: Deadline for the job to complete
         required: true
         type: number
-      wheel-tags-to-skip:
-        description: Wheel tags to skip building
-        default: ''
-        required: false
-        type: string
 
 env:
   FORCE_COLOR: "1"  # Make tools pretty.
@@ -50,14 +53,21 @@ jobs:
         inputs.check-name
         && inputs.check-name
         || format(
-          'Build wheels on {0} {1}',
+          'Build wheels on {0}{1}',
           inputs.runner-vm-os,
-          inputs.qemu
+          inputs.qemu && ' under QEMU' || ''
         )
       }}
     runs-on: ${{ inputs.runner-vm-os }}
     timeout-minutes: ${{ fromJSON(inputs.timeout-minutes) }}
     steps:
+    - name: Export requested job-global environment variables
+      if: inputs.environment-variables != ''
+      env:
+        INPUT_ENVIRONMENT_VARIABLES: ${{ inputs.environment-variables }}
+      run: echo "${INPUT_ENVIRONMENT_VARIABLES}" >> "${GITHUB_ENV}"
+      shell: bash
+
     - name: Compute GHA artifact name ending
       id: gha-artifact-name
       run: |
@@ -88,32 +98,16 @@ jobs:
       uses: docker/setup-qemu-action@v3
       with:
         platforms: all
-      id: qemu
-    - name: Prepare emulation
-      if: inputs.qemu
-      run: |
-        # Build emulated architectures only if QEMU is set,
-        # use default "auto" otherwise
-        echo "CIBW_ARCHS_LINUX=${{ inputs.qemu }}" >> "${GITHUB_ENV}"
-      shell: bash
-
-    - name: Skip building some wheel tags
-      if: inputs.wheel-tags-to-skip
-      run: |
-        echo "CIBW_SKIP=${{ inputs.wheel-tags-to-skip }}" >> "${GITHUB_ENV}"
-      shell: bash
 
     - name: Build wheels
       uses: pypa/cibuildwheel@v3.0.0
-      env:
-        CIBW_ARCHS_MACOS: x86_64 arm64 universal2
 
     - name: Upload built artifacts for testing and publishing
       uses: actions/upload-artifact@v4
       with:
         name: ${{ inputs.dists-artifact-name }}-
           ${{ inputs.runner-vm-os }}-
-          ${{ inputs.qemu }}-
+          ${{ inputs.qemu && 'qemu-' || '' }}
           ${{ steps.gha-artifact-name.outputs.hash }}
         path: ./wheelhouse/*.whl