diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bdadd724d7..c3c55e87c2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -93,10 +93,6 @@ jobs: cd C:/robotology/vcpkg ./bootstrap-vcpkg.bat - # Install Catch2 - cd C:/robotology/vcpkg - ./vcpkg.exe --overlay-ports=C:/robotology/robotology-vcpkg-ports install catch2:x64-windows - # Install tomlplusplus ./vcpkg.exe --overlay-ports=C:/robotology/robotology-vcpkg-ports install tomlplusplus:x64-windows @@ -453,6 +449,21 @@ jobs: cmake --build . --config ${{ matrix.build_type }} --target install + - name: Catch2 Dependency [Windows] + if: matrix.os == 'windows-2019' + shell: bash + run: | + # Catch2 + git clone -b ${Catch2_TAG} https://github.com/catchorg/Catch2.git + cd Catch2 + mkdir -p build + cd build + cmake -A x64 -DCMAKE_TOOLCHAIN_FILE=${VCPKG_INSTALLATION_ROOT}/scripts/buildsystems/vcpkg.cmake \ + -DCMAKE_PREFIX_PATH=${GITHUB_WORKSPACE}/install/deps \ + -DCMAKE_INSTALL_PREFIX=${GITHUB_WORKSPACE}/install/deps \ + -DBUILD_TESTING=OFF .. + 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