Skip to content

Commit c3d2217

Browse files
committed
Implement fully-qualified runner-vm-os input
1 parent 2ca4ac5 commit c3d2217

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

.github/workflows/ci-cd.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -136,27 +136,26 @@ jobs:
136136
- pre-setup # transitive, for accessing settings
137137
strategy:
138138
matrix:
139-
os:
140-
- ubuntu
141-
- windows
142-
- macos
139+
runner-vm-os:
140+
- ubuntu-latest
141+
- windows-latest
142+
- macos-latest
143143
tag:
144-
- ''
144+
- manylinux
145145
- 'musllinux'
146146
exclude:
147-
- os: windows
147+
- runner-vm-os: windows-latest
148148
tag: 'musllinux'
149-
- os: macos
149+
- runner-vm-os: macos-latest
150150
tag: 'musllinux'
151-
- os: ubuntu
151+
- runner-vm-os: ubuntu-latest
152152
tag: >-
153153
${{
154154
(github.event_name != 'push' || !contains(github.ref, 'refs/tags/'))
155155
&& 'musllinux' || 'none'
156156
}}
157157
uses: ./.github/workflows/reusable-cibuildwheel.yml
158158
with:
159-
os: ${{ matrix.os }}
160159
tag: ${{ matrix.tag }}
161160
wheel-tags-to-skip: >-
162161
${{
@@ -169,6 +168,7 @@ jobs:
169168
|| (matrix.tag == 'musllinux') && '*-manylinux_* pp*'
170169
|| '*-musllinux_* pp*'
171170
}}
171+
runner-vm-os: ${{ matrix.runner-vm-os }}
172172
source-tarball-name: >-
173173
${{ needs.build-pure-python-dists.outputs.sdist-filename }}
174174
dists-artifact-name: ${{ needs.pre-setup.outputs.dists-artifact-name }}

.github/workflows/reusable-cibuildwheel.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@ on:
1414
default: '0'
1515
required: false
1616
type: string
17-
os:
18-
description: VM OS to use, without version suffix
19-
default: ubuntu
20-
required: false
21-
type: string
2217
qemu:
2318
description: Emulated QEMU architecture
2419
default: ''
@@ -29,6 +24,11 @@ on:
2924
default: ''
3025
required: false
3126
type: string
27+
runner-vm-os:
28+
description: VM OS to use
29+
default: ubuntu-latest
30+
required: false
31+
type: string
3232
source-tarball-name:
3333
description: Sdist filename wildcard
3434
required: true
@@ -48,8 +48,8 @@ jobs:
4848

4949
build-wheel:
5050
name: >-
51-
Build ${{ inputs.tag }} wheels on ${{ inputs.os }} ${{ inputs.qemu }}
52-
runs-on: ${{ inputs.os }}-latest
51+
Build ${{ inputs.tag }} wheels on ${{ inputs.runner-vm-os }} ${{ inputs.qemu }}
52+
runs-on: ${{ inputs.runner-vm-os }}
5353
timeout-minutes: ${{ inputs.qemu && 60 || 20 }}
5454
steps:
5555
- name: Retrieve the project source from an sdist inside the GHA artifact
@@ -94,7 +94,7 @@ jobs:
9494
uses: actions/upload-artifact@v4
9595
with:
9696
name: ${{ inputs.dists-artifact-name }}-
97-
${{ inputs.os }}-
97+
${{ inputs.runner-vm-os }}-
9898
${{ inputs.qemu }}-
9999
${{ inputs.tag }}
100100
path: ./wheelhouse/*.whl

0 commit comments

Comments
 (0)