Skip to content

Commit e2ab03f

Browse files
committed
Further .yml simplications
1 parent c04a299 commit e2ab03f

File tree

2 files changed

+3
-26
lines changed

2 files changed

+3
-26
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ jobs:
1212
build_wheels:
1313
name: Build and test on ${{ matrix.os }}${{ matrix.numpy-version && format(' (numpy {0})', matrix.numpy-version) || '' }}
1414
runs-on: ${{ matrix.os }}
15+
env:
16+
CMAKE_GENERATOR: Ninja
1517
strategy:
1618
matrix:
1719
os: [ubuntu-latest, windows-latest, macos-latest]
@@ -68,9 +70,6 @@ jobs:
6870
id: build_windows
6971
run: pip install -e .[test]
7072
env:
71-
CMAKE_GENERATOR: Ninja
72-
CMAKE_C_COMPILER: clang-cl
73-
CMAKE_CXX_COMPILER: clang-cl
7473
CMAKE_C_COMPILER_LAUNCHER: sccache
7574
CMAKE_CXX_COMPILER_LAUNCHER: sccache
7675
SCCACHE_DIR: C:\Users\runneradmin\AppData\Local\sccache

.github/workflows/cibuildwheels.yml

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ env:
1818
# musllinux takes too long to build, and it's not worth it for now
1919
CIBW_SKIP: "pp* *musllinux* *-win32"
2020
# Use explicit generator/compiler env vars; CMAKE_ARGS with spaces is not split on Windows.
21-
CIBW_ENVIRONMENT_WINDOWS: "PATH=C:\\Program Files\\LLVM\\bin;%PATH% CC=clang-cl CXX=clang-cl CMAKE_GENERATOR=Ninja CMAKE_C_COMPILER=clang-cl CMAKE_CXX_COMPILER=clang-cl CMAKE_C_COMPILER_LAUNCHER=sccache CMAKE_CXX_COMPILER_LAUNCHER=sccache CMAKE_BUILD_PARALLEL_LEVEL=8 SKBUILD_PARALLEL_LEVEL=8 SCCACHE_DIR=C:\\Users\\runneradmin\\AppData\\Local\\sccache"
21+
CIBW_ENVIRONMENT_WINDOWS: "PATH=C:\\Program Files\\LLVM\\bin;%PATH% CMAKE_GENERATOR=Ninja CC=clang-cl CXX=clang-cl"
2222

2323
jobs:
2424

@@ -83,28 +83,6 @@ jobs:
8383
if: ${{ matrix.os == 'windows-latest' }}
8484
run: echo "C:\\Program Files\\LLVM\\bin" >> $env:GITHUB_PATH
8585

86-
- name: Install sccache (Windows)
87-
if: ${{ matrix.os == 'windows-latest' }}
88-
run: choco install sccache --yes
89-
90-
- name: Cache sccache (Windows)
91-
if: ${{ matrix.os == 'windows-latest' }}
92-
uses: actions/cache@v4
93-
with:
94-
path: C:\Users\runneradmin\AppData\Local\sccache
95-
key: sccache-${{ runner.os }}-${{ github.sha }}
96-
restore-keys: |
97-
sccache-${{ runner.os }}-
98-
99-
- name: Cache pip (Windows)
100-
if: ${{ matrix.os == 'windows-latest' }}
101-
uses: actions/cache@v4
102-
with:
103-
path: C:\Users\runneradmin\AppData\Local\pip\Cache
104-
key: pip-${{ runner.os }}-${{ hashFiles('pyproject.toml') }}
105-
restore-keys: |
106-
pip-${{ runner.os }}-
107-
10886
- name: Install MSVC amd64
10987
uses: ilammy/msvc-dev-cmd@v1
11088
with:

0 commit comments

Comments
 (0)