Merge pull request #2099 from KLayout/pr-2083

Pr 2083

Author: klayoutmatthias

.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 }}

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