Skip to content

Commit 14fb2b3

Browse files
authored
Merge pull request #358 from jcarpent/devel
Fix CI + sync submodule cmake
2 parents 28e676a + bf56d28 commit 14fb2b3

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
name: ${{ matrix.os }} - ${{ matrix.build_type }} ${{ matrix.cxx_options }}
88
runs-on: ${{ matrix.os }}
99
env:
10-
CCACHE_DIR: /github/home/.ccache # Enable ccache
10+
CCACHE_DIR: .ccache # Enable ccache
1111

1212
strategy:
1313
fail-fast: false
@@ -46,7 +46,7 @@ jobs:
4646
shell: bash -l {0}
4747
run: |
4848
conda activate eigenpy
49-
conda install cmake -c main
49+
conda install cmake ccache -c conda-forge
5050
conda list
5151
5252
- name: Build EigenPy
@@ -58,7 +58,7 @@ jobs:
5858
mkdir build
5959
cd build
6060
61-
cmake .. -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=$(which python3) -DGENERATE_PYTHON_STUBS=ON -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_CXX_FLAGS=${{ matrix.cxx_options }}
61+
cmake .. -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DPYTHON_EXECUTABLE=$(which python3) -DGENERATE_PYTHON_STUBS=ON -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_CXX_FLAGS=${{ matrix.cxx_options }}
6262
make
6363
make build_tests
6464
export CTEST_OUTPUT_ON_FAILURE=1

0 commit comments

Comments
 (0)