Skip to content

Commit f0e381a

Browse files
authored
Merge pull request numpy#27088 from andyfaff/wheely
WHL: bump (musl) linux image [wheel build]
2 parents 10533ca + bf0e84b commit f0e381a

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

.github/workflows/linux_musl.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
container:
2525
# Use container used for building musllinux wheels
2626
# it has git installed, all the pythons, etc
27-
image: quay.io/pypa/musllinux_1_1_x86_64
27+
image: quay.io/pypa/musllinux_1_2_x86_64
2828

2929
steps:
3030
- name: setup

.github/workflows/wheels.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ jobs:
7676
# Github Actions doesn't support pairing matrix values together, let's improvise
7777
# https://github.com/github/feedback/discussions/7835#discussioncomment-1769026
7878
buildplat:
79-
- [ubuntu-20.04, manylinux_x86_64, ""]
80-
- [ubuntu-20.04, musllinux_x86_64, ""]
79+
- [ubuntu-22.04, manylinux_x86_64, ""]
80+
- [ubuntu-22.04, musllinux_x86_64, ""]
8181
- [macos-13, macosx_x86_64, openblas]
8282

8383
# targeting macos >= 14. Could probably build on macos-14, but it would be a cross-compile
@@ -90,7 +90,7 @@ jobs:
9090
# Don't build PyPy 32-bit windows
9191
- buildplat: [windows-2019, win32, ""]
9292
python: "pp310"
93-
- buildplat: [ ubuntu-20.04, musllinux_x86_64, "" ]
93+
- buildplat: [ ubuntu-22.04, musllinux_x86_64, "" ]
9494
python: "pp310"
9595
- buildplat: [ macos-14, macosx_arm64, accelerate ]
9696
python: "pp310"
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Bump the musllinux CI image and wheels to 1_2 from 1_1. This is because 1_1 is
2+
`end of life <https://github.com/pypa/manylinux/issues/1629>`_.

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ test-command = "bash {project}/tools/wheels/cibw_test_command.sh {project}"
149149
[tool.cibuildwheel.linux]
150150
manylinux-x86_64-image = "manylinux2014"
151151
manylinux-aarch64-image = "manylinux2014"
152-
musllinux-x86_64-image = "musllinux_1_1"
152+
musllinux-x86_64-image = "musllinux_1_2"
153153

154154
[tool.cibuildwheel.pyodide]
155155
config-settings = "build-dir=build setup-args=--cross-file=$PWD/tools/ci/emscripten/emscripten.meson.cross setup-args=-Dblas=none setup-args=-Dlapack=none"

0 commit comments

Comments
 (0)