Merge branch 'manylinux-bump' into m134-public

Author: HinTak

.github/workflows/ci.yml

@@ -30,7 +30,7 @@ jobs:
         uses: docker/setup-qemu-action@v3
       - name: Build skia 3rd-Party
         # Taken from https://github.com/pypa/cibuildwheel/blob/v2.19.2/cibuildwheel/resources/pinned_docker_images.cfg
-        uses: docker://quay.io/pypa/manylinux2014_aarch64:2024.07.02-0
+        uses: docker://quay.io/pypa/manylinux_2_28_aarch64:2024.07.02-0
         if: ${{ steps.cache-skia.outputs.cache-hit != 'true' }}
         with:
           args: bash -c "git config --global --add safe.directory '*' &&
@@ -61,7 +61,7 @@ jobs:
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       - name: Build Skia Proper
-        uses: docker://quay.io/pypa/manylinux2014_aarch64:2024.07.02-0
+        uses: docker://quay.io/pypa/manylinux_2_28_aarch64:2024.07.02-0
         with:
           args: bash -c "git config --global --add safe.directory '*' &&
                          bash scripts/build_Linux.sh
@@ -116,6 +116,8 @@ jobs:
       - name: Build wheels
         uses: pypa/[email protected]
         env:
+          CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28
+          CIBW_MANYLINUX_AARCH64_IMAGE: manylinux_2_28
           CIBW_BUILD: "${{ matrix.cp }}-*"
           CIBW_SKIP: "*musllinux*"
           CIBW_ARCHS: ${{ matrix.arch }}
@@ -179,6 +181,8 @@ jobs:
       - name: Build wheels
         uses: pypa/[email protected]
         env:
+          CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28
+          CIBW_MANYLINUX_AARCH64_IMAGE: manylinux_2_28
           CIBW_BUILD: "${{ matrix.cp }}-*"
           CIBW_SKIP: "*musllinux*"
           CIBW_ARCHS: ${{ matrix.arch }}

scripts/build_Linux.sh

@@ -33,7 +33,6 @@ if [[ $(uname -m) == "aarch64" ]]; then
     yum -y install epel-release && \
         yum repolist && \
         yum install -y ninja-build && \
-        ln -s ninja-build /usr/bin/ninja &&
         mv depot_tools/ninja depot_tools/ninja.bak
 fi
 
@@ -54,7 +53,7 @@ fi
 git clone https://gn.googlesource.com/gn && \
     cd gn && \
     git checkout fe330c0ae1ec29db30b6f830e50771a335e071fb && \
-    python build/gen.py && \
+    python3 build/gen.py && \
     ninja -C out gn && \
     cd ..