Skip to content

Commit

Permalink
Use conda-forge's catch2 in CI to avoid build failures, set OMP_NUM_T…
Browse files Browse the repository at this point in the history
…HREADS=1 and updated catch2's used by FetchContent to 3.7.1 (#884)
  • Loading branch information
traversaro authored Sep 23, 2024
1 parent 208aa64 commit 0ee61e7
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
11 changes: 8 additions & 3 deletions .github/workflows/conda-forge-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ on:
# Execute a "nightly" build at 2 AM UTC
- cron: '0 2 * * *'

# Workaround for https://github.com/conda-forge/mumps-feedstock/issues/125
# and https://github.com/conda-forge/mumps-feedstock/pull/126#issuecomment-2355357834
env:
OMP_NUM_THREADS: 1

jobs:
build:
name: '[${{ matrix.os }}@${{ matrix.build_type }}@conda]'
Expand Down Expand Up @@ -41,7 +46,7 @@ jobs:
liblie-group-controllers eigen qhull "casadi>=3.5.5" cppad spdlog \
nlohmann_json manif manifpy pybind11 numpy pytest scipy opencv pcl \
tomlplusplus libunicycle-footstep-planner "icub-models>=1.23.4" \
ros-humble-rclcpp onnxruntime-cpp libbayes-filters-lib cmake-package-check
ros-humble-rclcpp onnxruntime-cpp libbayes-filters-lib cmake-package-check catch2
- name: Linux-only Dependencies [Linux]
if: contains(matrix.os, 'ubuntu')
Expand Down Expand Up @@ -79,7 +84,7 @@ jobs:
mkdir -p build
cd build
cmake -GNinja -DBUILD_TESTING:BOOL=ON -DFRAMEWORK_COMPILE_IK:BOOL=OFF -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX \
-DFRAMEWORK_COMPILE_PYTHON_BINDINGS:BOOL=ON -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} ..
-DFRAMEWORK_COMPILE_PYTHON_BINDINGS:BOOL=ON -DUSE_SYSTEM_Catch2:BOOL=ON -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} ..
- name: Build [Linux&macOS]
if: contains(matrix.os, 'macos') || contains(matrix.os, 'ubuntu')
Expand All @@ -101,7 +106,7 @@ jobs:
run: |
mkdir -p build
cd build
cmake -GNinja -DBUILD_TESTING:BOOL=ON -DFRAMEWORK_COMPILE_PYTHON_BINDINGS:BOOL=ON -DCMAKE_INSTALL_PREFIX=%CONDA_PREFIX%\Library -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} ..
cmake -GNinja -DBUILD_TESTING:BOOL=ON -DFRAMEWORK_COMPILE_PYTHON_BINDINGS:BOOL=ON -DUSE_SYSTEM_Catch2:BOOL=ON -DCMAKE_INSTALL_PREFIX=%CONDA_PREFIX%\Library -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} ..
- name: Build [Windows]
if: contains(matrix.os, 'windows')
Expand Down
2 changes: 1 addition & 1 deletion cmake/AddBipedalLocomotionUnitTest.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ if (BUILD_TESTING)
include(FetchContent)
FetchContent_Declare(Catch2
GIT_REPOSITORY https://github.com/catchorg/Catch2.git
GIT_TAG v3.0.1)
GIT_TAG v3.7.1)

FetchContent_GetProperties(Catch2)
if(NOT Catch2_POPULATED)
Expand Down

0 comments on commit 0ee61e7

Please sign in to comment.