Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ask for Catch2 v2.13.9 in macOS ci #537

Merged
merged 1 commit into from
Jun 17, 2022
Merged

Ask for Catch2 v2.13.9 in macOS ci #537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ jobs:
run: |

brew update
brew install ace boost eigen swig qt5 orocos-kdl catch2 qhull ipopt cppad pkg-config pybind11 libmatio spdlog librealsense nlohmann-json
brew install ace boost eigen swig qt5 orocos-kdl qhull ipopt cppad pkg-config pybind11 libmatio spdlog librealsense nlohmann-json

- name: Dependencies [Ubuntu]
if: startsWith(matrix.os, 'ubuntu')
Expand Down Expand Up @@ -430,8 +430,8 @@ jobs:
cmake -DCMAKE_INSTALL_PREFIX=${GITHUB_WORKSPACE}/install/deps -DICUB_MODELS_USES_PYTHON:BOOL=ON ..
cmake --build . --config ${{ matrix.build_type }} --target install

- name: Source-based Dependencies [Ubuntu]
if: steps.cache-source-deps.outputs.cache-hit != 'true' && startsWith(matrix.os, 'ubuntu')
- name: Catch2 Dependency [Ubuntu/macOS]
if: steps.cache-source-deps.outputs.cache-hit != 'true' && (startsWith(matrix.os, 'ubuntu') || matrix.os == 'macos-latest')
shell: bash
run: |
# Catch2
Expand All @@ -445,6 +445,10 @@ jobs:

cmake --build . --config ${{ matrix.build_type }} --target install

- name: Source-based Dependencies [Ubuntu]
if: steps.cache-source-deps.outputs.cache-hit != 'true' && startsWith(matrix.os, 'ubuntu')
shell: bash
run: |
# Qhull
cd ${GITHUB_WORKSPACE}
git clone https://github.com/qhull/qhull
Expand All @@ -457,10 +461,6 @@ jobs:
-DCMAKE_POSITION_INDEPENDENT_CODE=ON ..
cmake --build . --config ${{ matrix.build_type }} --target install

- name: CppAD [Ubuntu]
if: startsWith(matrix.os, 'ubuntu')
shell: bash
run: |
# CppAD
git clone https://github.com/coin-or/CppAD.git
cd CppAD
Expand All @@ -473,7 +473,7 @@ jobs:

cmake --build . --config ${{ matrix.build_type }} --target install

- name: Install manifpy [Ubintu/macOS]
- name: Install manifpy [Ubuntu/macOS]
if: startsWith(matrix.os, 'ubuntu') || matrix.os == 'macos-latest'
run: |
git clone https://github.com/artivis/manif.git manifpy
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/conda-forge-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
# Compilation related dependencies
mamba install cmake compilers make ninja pkg-config
# Actual dependencies
mamba install idyntree "yarp>=3.5.0" libmatio matio-cpp lie-group-controllers eigen qhull "casadi>=3.5.5" cppad spdlog catch2 nlohmann_json manif manifpy pybind11 numpy pytest scipy opencv pcl tomlplusplus unicycle-footstep-planner "icub-models>=1.23.4"
mamba install idyntree "yarp>=3.5.0" libmatio matio-cpp lie-group-controllers eigen qhull "casadi>=3.5.5" cppad spdlog "catch2=2" nlohmann_json manif manifpy pybind11 numpy pytest scipy opencv pcl tomlplusplus unicycle-footstep-planner "icub-models>=1.23.4"

- name: Linux-only Dependencies [Linux]
if: contains(matrix.os, 'ubuntu')
Expand Down