Skip to content

Commit 9221bdd

Browse files
committed
Fix musllinux configuration for cibuildwheel 3.x
- Remove CIBW_MUSLLINUX_*_IMAGE overrides (let cibuildwheel auto-select) - Remove musllinux_image fields from matrix entries - Add CIBW_TEST_SKIP for win_arm64 (x64 runners can't execute ARM64 binaries) - cibuildwheel 3.x automatically selects appropriate musllinux images per Python version
1 parent df4a624 commit 9221bdd

1 file changed

Lines changed: 3 additions & 16 deletions

File tree

.github/workflows/cibuildwheel.yml

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -186,77 +186,65 @@ jobs:
186186
arch: ARM64
187187

188188
# Linux musllinux x86_64 (Alpine Linux)
189+
# Note: cibuildwheel 3.x auto-selects appropriate musllinux images
189190
- os: ubuntu-latest
190191
python: 38
191192
platform_id: musllinux_x86_64
192-
musllinux_image: musllinux_1_1
193193
arch: x86_64
194194
- os: ubuntu-latest
195195
python: 39
196196
platform_id: musllinux_x86_64
197-
musllinux_image: musllinux_1_1
198197
arch: x86_64
199198
- os: ubuntu-latest
200199
python: 310
201200
platform_id: musllinux_x86_64
202-
musllinux_image: musllinux_1_1
203201
arch: x86_64
204202
- os: ubuntu-latest
205203
python: 311
206204
platform_id: musllinux_x86_64
207-
musllinux_image: musllinux_1_1
208205
arch: x86_64
209206
- os: ubuntu-latest
210207
python: 312
211208
platform_id: musllinux_x86_64
212-
musllinux_image: musllinux_1_1
213209
arch: x86_64
214210
- os: ubuntu-latest
215211
python: 313
216212
platform_id: musllinux_x86_64
217-
musllinux_image: musllinux_1_2
218213
arch: x86_64
219214
- os: ubuntu-latest
220215
python: 314
221216
platform_id: musllinux_x86_64
222-
musllinux_image: musllinux_1_2
223217
arch: x86_64
224218

225219
# Linux musllinux aarch64 (Alpine Linux ARM64)
220+
# Note: cibuildwheel 3.x auto-selects appropriate musllinux images
226221
- os: ubuntu-latest
227222
python: 38
228223
platform_id: musllinux_aarch64
229-
musllinux_image: musllinux_1_1
230224
arch: aarch64
231225
- os: ubuntu-latest
232226
python: 39
233227
platform_id: musllinux_aarch64
234-
musllinux_image: musllinux_1_1
235228
arch: aarch64
236229
- os: ubuntu-latest
237230
python: 310
238231
platform_id: musllinux_aarch64
239-
musllinux_image: musllinux_1_1
240232
arch: aarch64
241233
- os: ubuntu-latest
242234
python: 311
243235
platform_id: musllinux_aarch64
244-
musllinux_image: musllinux_1_1
245236
arch: aarch64
246237
- os: ubuntu-latest
247238
python: 312
248239
platform_id: musllinux_aarch64
249-
musllinux_image: musllinux_1_1
250240
arch: aarch64
251241
- os: ubuntu-latest
252242
python: 313
253243
platform_id: musllinux_aarch64
254-
musllinux_image: musllinux_1_2
255244
arch: aarch64
256245
- os: ubuntu-latest
257246
python: 314
258247
platform_id: musllinux_aarch64
259-
musllinux_image: musllinux_1_2
260248
arch: aarch64
261249

262250
# MacOS arm64
@@ -315,12 +303,11 @@ jobs:
315303
env:
316304
CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.manylinux_image }}
317305
CIBW_MANYLINUX_AARCH64_IMAGE: ${{ matrix.manylinux_image }}
318-
CIBW_MUSLLINUX_X86_64_IMAGE: ${{ matrix.musllinux_image }}
319-
CIBW_MUSLLINUX_AARCH64_IMAGE: ${{ matrix.musllinux_image }}
320306
CIBW_BUILD: cp${{ matrix.python }}-${{ matrix.platform_id }}
321307
CIBW_BEFORE_BUILD: pip install pybind11
322308
CIBW_TEST_COMMAND: python {project}/tests/_ci_debug_import.py && pytest {project}/tests -vv
323309
CIBW_TEST_COMMAND_WINDOWS: python {project}\tests\_ci_debug_import.py && pytest {project}\tests -vv
310+
CIBW_TEST_SKIP: "*-win_arm64"
324311
CIBW_TEST_REQUIRES: pytest numpy
325312
CIBW_BUILD_VERBOSITY: 1
326313
CIBW_ARCHS: ${{ matrix.arch }}

0 commit comments

Comments
 (0)