ci: Fix ccache env variable

stack-of-tasks · Jan 9, 2024 · 7dbe3af · 7dbe3af
1 parent ee173c1
commit 7dbe3af
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 21 deletions.
diff --git a/.github/workflows/conda/environment_macos_linux.yml b/.github/workflows/conda/environment_macos_linux.yml
@@ -7,6 +7,6 @@ dependencies:
   - numpy
   - pkg-config
   - boost
-  - cmake
   - ccache
   - cxx-compiler
+  - ninja
diff --git a/.github/workflows/macos-linux-conda.yml b/.github/workflows/macos-linux-conda.yml
@@ -7,10 +7,10 @@ jobs:
     name: ${{ matrix.os }} - Python ${{ matrix.python-version }} ${{ matrix.build_type }} ${{ matrix.cxx_options }}
     runs-on: ${{ matrix.os }}
     env:
-      ccache_basedir: "${github_workspace}"
-      ccache_dir: "${github_workspace}/.ccache"
-      ccache_compress: true
-      ccache_compresslevel: 6
+      CCACHE_BASEDIR: "${GITHUB_WORKSPACE}"
+      CCACHE_DIR: "${GITHUB_WORKSPACE}/.ccache"
+      CCACHE_COMPRESS: true
+      CCACHE_COMPRESSLEVEL: 6
 
     strategy:
       fail-fast: false
@@ -33,6 +33,12 @@ jobs:
       with:
         submodules: recursive
 
+    - uses: actions/cache@v3
+      with:
+        path: .ccache
+        key: ccache-macos-linux-conda-${{ matrix.os }}-${{ matrix.build_type }}-${{ matrix.cxx_options }}-${{ github.sha }}
+        restore-keys: ccache-macos-linux-conda-${{ matrix.os }}-${{ matrix.build_type }}-${{ matrix.cxx_options }}-
+
     - uses: conda-incubator/setup-miniconda@v3
       with:
         activate-environment: eigenpy
@@ -41,12 +47,6 @@ jobs:
         python-version: ${{ matrix.python-version }}
         auto-activate-base: false
 
-    - uses: actions/cache@v3
-      with:
-        path: .ccache
-        key: ccache-macos-linux-conda-${{ matrix.os }}-${{ matrix.build_type }}-${{ matrix.cxx_options }}-${{ github.sha }}
-        restore-keys: ccache-macos-linux-conda-${{ matrix.os }}-${{ matrix.build_type }}-${{ matrix.cxx_options }}-
-
     - name: Build EigenPy
       shell: bash -el {0}
       run: |
@@ -57,23 +57,23 @@ jobs:
         cd build
 
         cmake .. \
+          -G "Ninja" \
           -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 }}
-        make
-        make build_tests
-        export CTEST_OUTPUT_ON_FAILURE=1
-        make test
-        make install
+        cmake --build .
+        ctest --output-on-failure
+        cmake --install .
 
     - name: Test packaging
       shell: bash -el {0}
       run: |
         cmake -B test-packaging \
           -S unittest/packaging/cmake \
+          -G "Ninja" \
           -DPYTHON_EXECUTABLE=$(which python3)
 
     - name: Configure hpp-fcl
@@ -84,7 +84,9 @@ jobs:
         git clone https://github.com/humanoid-path-planner/hpp-fcl.git --recursive
         cd hpp-fcl
         mkdir build && cd build
-        cmake .. -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX \
+        cmake .. \
+          -G "Ninja" \
+          -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX \
           -DCMAKE_BUILD_TYPE=Release \
           -DPYTHON_EXECUTABLE=$(which python3)
 

diff --git a/.github/workflows/windows-conda.yml b/.github/workflows/windows-conda.yml
@@ -5,10 +5,10 @@ jobs:
   build:
     runs-on: ${{ matrix.os }}
     env:
-      ccache_basedir: "${github_workspace}"
-      ccache_dir: "${github_workspace}/.ccache"
-      ccache_compress: true
-      ccache_compresslevel: 6
+      CCACHE_BASEDIR: "${GITHUB_WORKSPACE}"
+      CCACHE_DIR: "${GITHUB_WORKSPACE}/.ccache"
+      CCACHE_COMPRESS: true
+      CCACHE_COMPRESSLEVEL: 6
 
     strategy:
       fail-fast: false