Skip to content

Commit bd23326

Browse files
committed
Set cibuildwheel manylinux image explicitly
1 parent 6844ddd commit bd23326

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

.github/workflows/cd-wheel.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,8 @@ jobs:
179179
SOURCE="$PWD/package/source"
180180
WORKDIR="$PWD/package/workdir"
181181
DESTDIR="$PWD/package/install"
182+
CIBW_MANYLINUX_AARCH64_IMAGE: "manylinux_2_28"
183+
CIBW_MANYLINUX_X86_64_IMAGE: "manylinux_2_28"
182184

183185
- id: sha256sum
184186
run: |

patches/auditwheel.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ def walk(topdir):
4040
)
4141

4242
if "repair" in sys.argv:
43-
sys.argv.append("--only-plat")
43+
args = ["--only-plat"]
4444
for name in exclude:
45-
sys.argv.append("--exclude")
46-
sys.argv.append(f"lib{name}.so.*")
45+
args += ["--exclude", f"lib{name}.so.*"]
46+
sys.argv.extend(args)
4747

4848
sys.exit(main())

wheel-build.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@ export CIBW_BEFORE_BUILD='bash {project}/cibw-patch-cmd.sh'
1818
export CIBW_TEST_COMMAND='bash {project}/cibw-check-mpi.sh'
1919
export CIBW_ENVIRONMENT_PASS='SOURCE WORKDIR DESTDIR'
2020

21+
manylinuximage='manylinux_2_28'
22+
export CIBW_MANYLINUX_AARCH64_IMAGE=$manylinuximage
23+
export CIBW_MANYLINUX_X86_64_IMAGE=$manylinuximage
24+
2125
if test "$(uname)" = Linux; then
22-
# manylinuximage=manylinux2014
23-
# export CIBW_MANYLINUX_AARCH64_IMAGE=$manylinuximage
24-
# export CIBW_MANYLINUX_X86_64_IMAGE=$manylinuximage
2526
containerengine=$(basename "$(command -v podman || command -v docker)")
2627
export CIBW_CONTAINER_ENGINE=$containerengine
2728
export SOURCE="/project/$SOURCE"
@@ -31,7 +32,6 @@ if test "$(uname)" = Linux; then
3132
fi
3233
if test "$(uname)" = Darwin; then
3334
export MACOSX_DEPLOYMENT_TARGET=11.0
34-
export CIBW_BUILD_FRONTEND='build'
3535
export CIBW_BUILD='pp311-*'
3636
export SOURCE="$PWD/$SOURCE"
3737
export WORKDIR="$PWD/$WORKDIR"

0 commit comments

Comments
 (0)