Skip to content

Commit 75d1f1b

Browse files
committed
ci: Fix ccache env variable
1 parent ee173c1 commit 75d1f1b

File tree

3 files changed

+24
-22
lines changed

3 files changed

+24
-22
lines changed

.github/workflows/conda/environment_macos_linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ dependencies:
77
- numpy
88
- pkg-config
99
- boost
10-
- cmake
1110
- ccache
1211
- cxx-compiler
12+
- ninja

.github/workflows/macos-linux-conda.yml

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ jobs:
77
name: ${{ matrix.os }} - Python ${{ matrix.python-version }} ${{ matrix.build_type }} ${{ matrix.cxx_options }}
88
runs-on: ${{ matrix.os }}
99
env:
10-
ccache_basedir: "${github_workspace}"
11-
ccache_dir: "${github_workspace}/.ccache"
12-
ccache_compress: true
13-
ccache_compresslevel: 6
10+
CCACHE_BASEDIR: "${GITHUB_WORKSPACE}"
11+
CCACHE_DIR: "${GITHUB_WORKSPACE}/.ccache"
12+
CCACHE_COMPRESS: true
13+
CCACHE_COMPRESSLEVEL: 6
1414

1515
strategy:
1616
fail-fast: false
@@ -33,6 +33,12 @@ jobs:
3333
with:
3434
submodules: recursive
3535

36+
- uses: actions/cache@v3
37+
with:
38+
path: .ccache
39+
key: ccache-macos-linux-conda-${{ matrix.os }}-${{ matrix.build_type }}-${{ matrix.cxx_options }}-${{ github.sha }}
40+
restore-keys: ccache-macos-linux-conda-${{ matrix.os }}-${{ matrix.build_type }}-${{ matrix.cxx_options }}-
41+
3642
- uses: conda-incubator/setup-miniconda@v3
3743
with:
3844
activate-environment: eigenpy
@@ -41,12 +47,6 @@ jobs:
4147
python-version: ${{ matrix.python-version }}
4248
auto-activate-base: false
4349

44-
- uses: actions/cache@v3
45-
with:
46-
path: .ccache
47-
key: ccache-macos-linux-conda-${{ matrix.os }}-${{ matrix.build_type }}-${{ matrix.cxx_options }}-${{ github.sha }}
48-
restore-keys: ccache-macos-linux-conda-${{ matrix.os }}-${{ matrix.build_type }}-${{ matrix.cxx_options }}-
49-
5050
- name: Build EigenPy
5151
shell: bash -el {0}
5252
run: |
@@ -57,23 +57,23 @@ jobs:
5757
cd build
5858
5959
cmake .. \
60+
-G "Ninja" \
6061
-DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX \
6162
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
6263
-DPYTHON_EXECUTABLE=$(which python3) \
6364
-DGENERATE_PYTHON_STUBS=ON \
6465
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
6566
-DCMAKE_CXX_FLAGS=${{ matrix.cxx_options }}
66-
make
67-
make build_tests
68-
export CTEST_OUTPUT_ON_FAILURE=1
69-
make test
70-
make install
67+
cmake --build .
68+
ctest --output-on-failure
69+
cmake --install .
7170
7271
- name: Test packaging
7372
shell: bash -el {0}
7473
run: |
7574
cmake -B test-packaging \
7675
-S unittest/packaging/cmake \
76+
-G "Ninja" \
7777
-DPYTHON_EXECUTABLE=$(which python3)
7878
7979
- name: Configure hpp-fcl
@@ -84,15 +84,17 @@ jobs:
8484
git clone https://github.com/humanoid-path-planner/hpp-fcl.git --recursive
8585
cd hpp-fcl
8686
mkdir build && cd build
87-
cmake .. -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX \
87+
cmake .. \
88+
-G "Ninja" \
89+
-DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX \
8890
-DCMAKE_BUILD_TYPE=Release \
8991
-DPYTHON_EXECUTABLE=$(which python3)
9092
9193
- name: Uninstall EigenPy
9294
shell: bash -el {0}
9395
run: |
9496
cd build
95-
make uninstall
97+
cmake --build . --target uninstall
9698
9799
98100
check:

.github/workflows/windows-conda.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ jobs:
55
build:
66
runs-on: ${{ matrix.os }}
77
env:
8-
ccache_basedir: "${github_workspace}"
9-
ccache_dir: "${github_workspace}/.ccache"
10-
ccache_compress: true
11-
ccache_compresslevel: 6
8+
CCACHE_BASEDIR: "${GITHUB_WORKSPACE}"
9+
CCACHE_DIR: "${GITHUB_WORKSPACE}/.ccache"
10+
CCACHE_COMPRESS: true
11+
CCACHE_COMPRESSLEVEL: 6
1212

1313
strategy:
1414
fail-fast: false

0 commit comments

Comments
 (0)