Skip to content

Commit a7ca3d8

Browse files
committed
cibuildwheel will default to manylinux_2_28 on 6th May 2025 - Let's do it earlier.
See https://cibuildwheel.pypa.io/en/stable/options/#linux-image and pypa/cibuildwheel#1772 Fixes #284 and #175 The newer Linux has /usr/bin/ninja and does not have python Conflicts: .github/workflows/ci.yml scripts/build_Linux.sh
1 parent 27c9e21 commit a7ca3d8

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ jobs:
2828
- name: Set up QEMU
2929
uses: docker/setup-qemu-action@v3
3030
- name: Build skia
31-
# Taken from https://github.com/pypa/cibuildwheel/blob/v2.16.2/cibuildwheel/resources/pinned_docker_images.cfg
32-
uses: docker://quay.io/pypa/manylinux2014_aarch64:2024.07.02-0
31+
# Taken from https://github.com/pypa/cibuildwheel/blob/v2.19.2/cibuildwheel/resources/pinned_docker_images.cfg
32+
uses: docker://quay.io/pypa/manylinux_2_28_aarch64:2024.07.02-0
3333
if: ${{ steps.cache-skia.outputs.cache-hit != 'true' }}
3434
with:
3535
args: bash -c "git config --global --add safe.directory '*' &&
@@ -86,6 +86,8 @@ jobs:
8686
- name: Build wheels
8787
uses: pypa/[email protected]
8888
env:
89+
CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28
90+
CIBW_MANYLINUX_AARCH64_IMAGE: manylinux_2_28
8991
CIBW_BUILD: "${{ matrix.cp }}-*"
9092
CIBW_SKIP: "*musllinux*"
9193
CIBW_ARCHS: ${{ matrix.arch }}
@@ -150,6 +152,8 @@ jobs:
150152
- name: Build wheels
151153
uses: pypa/[email protected]
152154
env:
155+
CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28
156+
CIBW_MANYLINUX_AARCH64_IMAGE: manylinux_2_28
153157
CIBW_BUILD: "${{ matrix.cp }}-*"
154158
CIBW_SKIP: "*musllinux*"
155159
CIBW_ARCHS: ${{ matrix.arch }}

scripts/build_Linux.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ if [[ $(uname -m) == "aarch64" ]]; then
99
yum -y install epel-release && \
1010
yum repolist && \
1111
yum install -y ninja-build && \
12-
ln -s ninja-build /usr/bin/ninja &&
1312
mv depot_tools/ninja depot_tools/ninja.bak
1413
fi
1514

@@ -36,7 +35,7 @@ export LDFLAGS="-lrt"
3635
git clone https://gn.googlesource.com/gn && \
3736
cd gn && \
3837
git checkout 981f46c64d1456d2083b1a2fa1367e753e0cdc1b && \
39-
python build/gen.py && \
38+
python3 build/gen.py && \
4039
ninja -C out gn && \
4140
cd ..
4241

0 commit comments

Comments
 (0)