luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2099 from KLayout/pr-2083 

Pr 2083
This commit is contained in:
Matthias Köfferlein 2025-07-20 15:57:06 +02:00 committed by GitHub
parent 9d4a578a5e 10272651c8
commit f0f7b8eead
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build.yml vendored
View File

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

18
ci-scripts/docker/docker_prepare.sh
View File

@ -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