From 164f7f5ce0a8aa8d38d8b2317a93921e1432ae34 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Jul 2025 21:29:38 +0000 Subject: [PATCH 1/2] Bump pypa/cibuildwheel from 2.23.3 to 3.0.0 Bumps [pypa/cibuildwheel](https://github.com/pypa/cibuildwheel) from 2.23.3 to 3.0.0. - [Release notes](https://github.com/pypa/cibuildwheel/releases) - [Changelog](https://github.com/pypa/cibuildwheel/blob/main/docs/changelog.md) - [Commits](https://github.com/pypa/cibuildwheel/compare/v2.23.3...v3.0.0) --- updated-dependencies: - dependency-name: pypa/cibuildwheel dependency-version: 3.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d3b1fba45..1c0720e77 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -66,7 +66,7 @@ jobs: mkdir -p $HOST_CCACHE_DIR - name: Build wheels (ARM) if: matrix.os == 'ubuntu-24.04-arm' - uses: pypa/cibuildwheel@v2.23.3 + uses: pypa/cibuildwheel@v3.0.0 env: # override the default CentOS “yum install … ccache” and drop ccache CIBW_BEFORE_ALL_LINUX: | @@ -81,7 +81,7 @@ jobs: - name: Build wheels (all other platforms) if: matrix.os != 'ubuntu-24.04-arm' - uses: pypa/cibuildwheel@v2.23.3 + uses: pypa/cibuildwheel@v3.0.0 env: CIBW_BUILD: ${{ matrix.cibuild }} CIBW_ARCHS_MACOS: ${{ matrix.macos-arch }} From b329ba739c51e515a933ac08316d2602f5cae442 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 19 Jul 2025 19:37:42 +0200 Subject: [PATCH 2/2] Preparing for PR #2083 With the new manylinux image, ccache is on a newer version that already creates some ccache links itself --- ci-scripts/docker/docker_prepare.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/ci-scripts/docker/docker_prepare.sh b/ci-scripts/docker/docker_prepare.sh index 4fb6e50c5..141f57f1a 100644 --- a/ci-scripts/docker/docker_prepare.sh +++ b/ci-scripts/docker/docker_prepare.sh @@ -11,16 +11,18 @@ if [[ -f "/etc/centos-release" ]]; then [ $s -eq 0 ] || exit $s if [[ -d "/usr/lib64/ccache" ]]; then - ln -s /usr/bin/ccache /usr/lib64/ccache/c++ - ln -s /usr/bin/ccache /usr/lib64/ccache/cc - ln -s /usr/bin/ccache /usr/lib64/ccache/gcc - ln -s /usr/bin/ccache /usr/lib64/ccache/g++ + for comp in c++ cc gcc g++; do + if ! [ -e /usr/lib64/ccache/$comp ]; then + ln -s /usr/bin/ccache /usr/lib64/ccache/$comp + fi + done export PATH="/usr/lib64/ccache:$PATH" elif [[ -d "/usr/lib/ccache" ]]; then - ln -s /usr/bin/ccache /usr/lib/ccache/c++ - ln -s /usr/bin/ccache /usr/lib/ccache/cc - ln -s /usr/bin/ccache /usr/lib/ccache/gcc - ln -s /usr/bin/ccache /usr/lib/ccache/g++ + for comp in c++ cc gcc g++; do + if ! [ -e /usr/lib/ccache/$comp ]; then + ln -s /usr/bin/ccache /usr/lib/ccache/$comp + fi + done export PATH="/usr/lib/ccache:$PATH" fi