From a325f969b7d793fdba3457411af153e1e4b3f91b Mon Sep 17 00:00:00 2001
From: Giulio Romualdi <giulio.romualdi@gmail.com>
Date: Fri, 17 Jun 2022 11:59:02 +0200
Subject: [PATCH] - Manualy install Catch2 v2.13.4 in macOS CI - Ask for Catch2
 v2.13.4 in conda CI

---
 .github/workflows/ci.yml             | 16 ++++++++--------
 .github/workflows/conda-forge-ci.yml |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a92c7ff7f5..738c9e84d6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -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')
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/.github/workflows/conda-forge-ci.yml b/.github/workflows/conda-forge-ci.yml
index 56c5ec3d7e..a013118d0a 100644
--- a/.github/workflows/conda-forge-ci.yml
+++ b/.github/workflows/conda-forge-ci.yml
@@ -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')