From e3624cece1237ab503a9bd9b00e97ad2a4010aa2 Mon Sep 17 00:00:00 2001
From: Joris Vaillant <joris.vaillant@inria.fr>
Date: Tue, 9 Jan 2024 11:33:19 +0100
Subject: [PATCH] ci: Fix ccache env variable and use Ninja in Linux/MacOS
build
---
.../conda/{conda-env.yml => conda-env-windows.yml} | 0
.github/workflows/macos-linux-conda.yml | 13 ++++++-------
.github/workflows/windows-conda-clang.yml | 12 +++++-------
.github/workflows/windows-conda-v142.yml | 2 +-
4 files changed, 12 insertions(+), 15 deletions(-)
rename .github/workflows/conda/{conda-env.yml => conda-env-windows.yml} (100%)
diff --git a/.github/workflows/conda/conda-env.yml b/.github/workflows/conda/conda-env-windows.yml
similarity index 100%
rename from .github/workflows/conda/conda-env.yml
rename to .github/workflows/conda/conda-env-windows.yml
diff --git a/.github/workflows/macos-linux-conda.yml b/.github/workflows/macos-linux-conda.yml
index ba3f9396..5a997173 100644
--- a/.github/workflows/macos-linux-conda.yml
+++ b/.github/workflows/macos-linux-conda.yml
@@ -55,25 +55,24 @@ jobs:
mkdir build
cd build
- export CXXFLAGS=${{ matrix.cxx_options }}
cmake .. \
+ -G "Ninja" \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX \
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
+ -DCMAKE_CXX_FLAGS=${{ matrix.cxx_options }} \
-DPYTHON_EXECUTABLE=$(which python3) \
-DGENERATE_PYTHON_STUBS=ON \
-DHPP_FCL_HAS_QHULL=ON
- make -j2
- make build_tests
- export CTEST_OUTPUT_ON_FAILURE=1
- make test
- make install
+ cmake --build . -j2
+ ctest --output-on-failure
+ cmake --install .
- name: Uninstall hpp-fcl
shell: bash -el {0}
run: |
cd build
- make uninstall
+ cmake --build . --target uninstall
check:
if: always()
diff --git a/.github/workflows/windows-conda-clang.yml b/.github/workflows/windows-conda-clang.yml
index 8e03b6cd..c52c71a0 100644
--- a/.github/workflows/windows-conda-clang.yml
+++ b/.github/workflows/windows-conda-clang.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
@@ -37,14 +37,12 @@ jobs:
with:
activate-environment: fcl
auto-update-conda: true
- environment-file: .github/workflows/conda/conda-env.yml
+ environment-file: .github/workflows/conda/conda-env-windows.yml
python-version: "3.10"
auto-activate-base: false
- name: Build FCL
shell: cmd /C CALL {0}
- env:
- ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
run: |
call "%programfiles(x86)%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64
diff --git a/.github/workflows/windows-conda-v142.yml b/.github/workflows/windows-conda-v142.yml
index 6b183034..cd3f3f8b 100644
--- a/.github/workflows/windows-conda-v142.yml
+++ b/.github/workflows/windows-conda-v142.yml
@@ -22,7 +22,7 @@ jobs:
ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
with:
activate-environment: fcl
- environment-file: .github/workflows/conda/conda-env.yml
+ environment-file: .github/workflows/conda/conda-env-windows.yml
python-version: "3.10"
- name: Install cmake and update conda
run: |
--
GitLab