Implement fully-qualified runner-vm-os input

Author: webknjaz

.github/workflows/ci-cd.yml

@@ -116,30 +116,29 @@ jobs:
     - pre-setup  # transitive, for accessing settings
     strategy:
       matrix:
-        os:
-        - ubuntu
-        - windows
+        runner-vm-os:
+        - ubuntu-latest
+        - windows-latest
         - windows-11-arm
-        - macos
+        - macos-latest
         tag:
         - ''
         - 'musllinux'
         exclude:
-        - os: windows
+        - runner-vm-os: windows-latest
           tag: 'musllinux'
-        - os: windows-11-arm
+        - runner-vm-os: windows-11-arm
           tag: 'musllinux'
-        - os: macos
+        - runner-vm-os: macos-latest
           tag: 'musllinux'
-        - os: ubuntu
+        - runner-vm-os: ubuntu-latest
           tag: >-
            ${{
            (github.event_name != 'push' || github.ref_type != 'tag')
            && 'musllinux' || 'none'
            }}
     uses: ./.github/workflows/reusable-cibuildwheel.yml
     with:
-      os: ${{ matrix.os }}
       tag: ${{ matrix.tag }}
       wheel-tags-to-skip: >-
         ${{
@@ -152,6 +151,7 @@ jobs:
         || (matrix.tag == 'musllinux') && '*-manylinux_* pp*'
         || '*-musllinux_* pp*'
         }}
+      runner-vm-os: ${{ matrix.runner-vm-os }}
       source-tarball-name: >-
         ${{ needs.build-pure-python-dists.outputs.sdist-filename }}
       dists-artifact-name: ${{ needs.pre-setup.outputs.dists-artifact-name }}

.github/workflows/reusable-cibuildwheel.yml

@@ -9,11 +9,6 @@ on:
         description: Workflow artifact name containing dists
         required: true
         type: string
-      os:
-        description: VM OS to use, without version suffix
-        default: ubuntu
-        required: false
-        type: string
       qemu:
         description: Emulated QEMU architecture
         default: ''
@@ -24,6 +19,11 @@ on:
         default: ''
         required: false
         type: string
+      runner-vm-os:
+        description: VM OS to use
+        default: ubuntu-latest
+        required: false
+        type: string
       source-tarball-name:
         description: Sdist filename wildcard
         required: true
@@ -43,11 +43,8 @@ jobs:
 
   build-wheel:
     name: >-
-      Build ${{ inputs.tag }} wheels on ${{ inputs.os }} ${{ inputs.qemu }}
-    runs-on: ${{
-        inputs.os == 'windows-11-arm' && inputs.os ||
-        format('{0}-latest', inputs.os)
-      }}
+      Build ${{ inputs.tag }} wheels on ${{ inputs.runner-vm-os }} ${{ inputs.qemu }}
+    runs-on: ${{ inputs.runner-vm-os }}
     timeout-minutes: ${{ inputs.qemu && 120 || 15 }}
     steps:
     - name: Compute GHA artifact name ending
@@ -100,7 +97,7 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         name: ${{ inputs.dists-artifact-name }}-
-          ${{ inputs.os }}-
+          ${{ inputs.runner-vm-os }}-
           ${{ inputs.qemu }}-
           ${{ inputs.tag }}-
           ${{ steps.gha-artifact-name.outputs.hash }}