mirror of https://github.com/KLayout/klayout.git
fixing if statement. porting changes back to original file
This commit is contained in:
parent
2917fd5098
commit
c816655fde
|
|
@ -36,7 +36,7 @@ jobs:
|
|||
cibw_arch: "musllinux"
|
||||
- os: "ubuntu-24.04-arm" # aarch64 manylinux on ARM runner
|
||||
cibuild: "*manylinux*"
|
||||
cibw_arch: "manylinux"
|
||||
cibw_arch: "aarch64"
|
||||
steps:
|
||||
- name: Free Disk Space (Ubuntu)
|
||||
if: matrix.os == 'ubuntu-latest'
|
||||
|
|
@ -51,29 +51,44 @@ jobs:
|
|||
uses: styfle/cancel-workflow-action@0.12.1
|
||||
- uses: actions/checkout@v4
|
||||
- name: ccache
|
||||
if: matrix.os != 'ubuntu-24.04-arm'
|
||||
uses: hendrikmuhs/ccache-action@v1.2
|
||||
with:
|
||||
key: ${{ github.job }}-${{ matrix.os }}-${{ matrix.cibuild }} # Make cache specific to OS
|
||||
max-size: "5G"
|
||||
- name: Install dependencies
|
||||
if: matrix.os != 'ubuntu-24.04-arm'
|
||||
run: |
|
||||
env
|
||||
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
|
||||
echo "/usr/lib/ccache:/usr/local/opt/ccache/libexec" >> $GITHUB_PATH
|
||||
HOST_CCACHE_DIR="$(ccache -k cache_dir)"
|
||||
mkdir -p $HOST_CCACHE_DIR
|
||||
- name: Build wheels # check https://cibuildwheel.readthedocs.io/en/stable/setup/#github-actions
|
||||
- name: Build wheels (ARM)
|
||||
if: matrix.os == 'ubuntu-24.04-arm'
|
||||
uses: pypa/cibuildwheel@v2.23.3
|
||||
env:
|
||||
# override the default CentOS “yum install … ccache” and drop ccache
|
||||
CIBW_BEFORE_ALL_LINUX: |
|
||||
yum install -y \
|
||||
zlib-devel \
|
||||
curl-devel \
|
||||
expat-devel \
|
||||
libpng-devel
|
||||
CIBW_BEFORE_BUILD_LINUX: "true"
|
||||
CIBW_BUILD: ${{ matrix.cibuild }}
|
||||
CIBW_ARCHS_LINUX: ${{ matrix.cibw_arch }}
|
||||
|
||||
- name: Build wheels (all other platforms)
|
||||
if: matrix.os != 'ubuntu-24.04-arm'
|
||||
uses: pypa/cibuildwheel@v2.23.3
|
||||
# to supply options, put them in 'env', like:
|
||||
# env:
|
||||
# CIBW_SOME_OPTION: value
|
||||
env:
|
||||
CIBW_BUILD: ${{ matrix.cibuild }}
|
||||
CIBW_ARCHS_MACOS: ${{ matrix.macos-arch }}
|
||||
CIBW_DEPENDENCY_VERSIONS_MACOS: cibw_constraints.txt
|
||||
|
||||
- name: Download Cache from Docker (linux only)
|
||||
if: ${{ runner.os == 'Linux' }}
|
||||
if: runner.os == 'Linux' && matrix.os != 'ubuntu-24.04-arm'
|
||||
# hack until https://github.com/pypa/cibuildwheel/issues/1030 is fixed
|
||||
run: |
|
||||
env
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ jobs:
|
|||
CIBW_DEPENDENCY_VERSIONS_MACOS: cibw_constraints.txt
|
||||
|
||||
- name: Download Cache from Docker (linux only)
|
||||
if: ${{ runner.os == 'Linux' }} and ${{ matrix.os != 'ubuntu-24.04-arm' }}
|
||||
if: runner.os == 'Linux' && matrix.os != 'ubuntu-24.04-arm'
|
||||
# hack until https://github.com/pypa/cibuildwheel/issues/1030 is fixed
|
||||
run: |
|
||||
env
|
||||
|
|
|
|||
Loading…
Reference in New Issue