Skip to content

Commit 926ad9a

Browse files
committed
ci: Update windows build with cl
1 parent a4898e2 commit 926ad9a

File tree

2 files changed

+22
-18
lines changed

2 files changed

+22
-18
lines changed

.github/workflows/windows-conda-clang.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ jobs:
3232
restore-keys: ccache-windows-conda-clang-${{ matrix.os }}-${{ matrix.compiler }}-
3333

3434
- uses: conda-incubator/setup-miniconda@v3
35-
env:
36-
ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
3735
with:
3836
activate-environment: fcl
3937
auto-update-conda: true
@@ -44,6 +42,8 @@ jobs:
4442
- name: Build FCL
4543
shell: cmd /C CALL {0}
4644
run: |
45+
conda list
46+
4747
call "%programfiles(x86)%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64
4848
:: Tell Ninja to use clang-cl
4949
set CC=clang-cl

.github/workflows/windows-conda-v142.yml

+20-16
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ on: [push,pull_request]
44
jobs:
55
build:
66
runs-on: ${{ matrix.os }}
7+
env:
8+
CCACHE_BASEDIR: "${GITHUB_WORKSPACE}"
9+
CCACHE_DIR: "${GITHUB_WORKSPACE}/.ccache"
10+
CCACHE_COMPRESS: true
11+
CCACHE_COMPRESSLEVEL: 6
12+
713
strategy:
814
fail-fast: false
915
matrix:
@@ -14,30 +20,28 @@ jobs:
1420
os: windows-2019
1521

1622
steps:
17-
- uses: actions/checkout@v3
23+
- uses: actions/checkout@v4
1824
with:
1925
submodules: recursive
20-
- uses: conda-incubator/setup-miniconda@v2
21-
env:
22-
ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
26+
27+
- uses: actions/cache@v3
28+
with:
29+
path: .ccache
30+
key: ccache-windows-conda-vs-${{ matrix.os }}-${{ matrix.compiler }}-${{ github.sha }}
31+
restore-keys: ccache-windows-conda-vs-${{ matrix.os }}-${{ matrix.compiler }}-
32+
33+
- uses: conda-incubator/setup-miniconda@v3
2334
with:
2435
activate-environment: fcl
36+
auto-update-conda: true
2537
environment-file: .github/workflows/conda/conda-env-windows.yml
2638
python-version: "3.10"
27-
- name: Install cmake and update conda
28-
run: |
29-
conda install cmake -c main
39+
auto-activate-base: false
3040

3141
- name: Build FCL
3242
shell: cmd /C CALL {0}
33-
env:
34-
ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
3543
run: |
36-
:: unset extra Boost envs
37-
set Boost_ROOT=
38-
set BOOST_ROOT_1_69_0=
39-
set BOOST_ROOT_1_72_0=
40-
set PATH=%PATH:C:\hostedtoolcache\windows\Boost\1.72.0;=%
44+
conda list
4145
4246
call "%programfiles(x86)%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64
4347
@@ -46,10 +50,10 @@ jobs:
4650
pushd build
4751
4852
:: Configure
49-
set PKG_CONFIG_PATH=%CONDA_PREFIX%\Library\share\pkgconfig:%CONDA_PREFIX%\Library\share\pkgconfig
5053
cmake ^
51-
-G "Visual Studio 16 2019" -T "v142" -DCMAKE_GENERATOR_PLATFORM=x64 ^
54+
-G "Ninja" ^
5255
-DCMAKE_INSTALL_PREFIX=%CONDA_PREFIX%\Library ^
56+
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache ^
5357
-DCMAKE_BUILD_TYPE=Release ^
5458
-DGENERATE_PYTHON_STUBS=ON ^
5559
-DPYTHON_SITELIB=%CONDA_PREFIX%\Lib\site-packages ^

0 commit comments

Comments
 (0)