diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 21dc1c6..d5e2bd8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ on: - cron: '0 2 * * *' env: - osqp_TAG: v0.6.0 + osqp_TAG: v0.6.2 vcpkg_robotology_TAG: v0.0.3 Catch2_TAG: v2.12.1 # Overwrite the VCPKG_INSTALLATION_ROOT env variable defined by GitHub Actions to point to our vcpkg @@ -66,7 +66,7 @@ jobs: - name: Dependencies [macOS] if: matrix.os == 'macOS-latest' run: | - brew install eigen catch2 + brew install eigen - name: Dependencies [Ubuntu] if: matrix.os == 'ubuntu-latest' @@ -109,19 +109,15 @@ jobs: cmake -DCMAKE_INSTALL_PREFIX=${GITHUB_WORKSPACE}/install/deps .. cmake --build . --config ${{ matrix.build_type }} --target install - - - name: Source-based Dependencies [Ubuntu] - if: steps.cache-source-deps.outputs.cache-hit != 'true' && matrix.os == 'ubuntu-latest' - shell: bash - run: | - git clone -b ${Catch2_TAG} https://github.com/catchorg/Catch2.git - cd Catch2 - mkdir -p build - cd build - 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 + # catch 2 + git clone -b ${Catch2_TAG} https://github.com/catchorg/Catch2.git + cd Catch2 + mkdir -p build + cd build + 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 # =================== # CMAKE-BASED PROJECT diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 04bbbc7..9c89aa8 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -3,6 +3,9 @@ on: push: branches: master +env: + mcss_TAG: 374ec55a6610c1856e7374aea7dc1535ed8b64f8 + jobs: build: runs-on: ubuntu-20.04 @@ -24,7 +27,9 @@ jobs: - name: Fetch m.css run: | cd ${GITHUB_WORKSPACE} - git clone git://github.com/mosra/m.css + git clone https://github.com/mosra/m.css.git + cd m.css + git checkout ${mcss_TAG} - name: Build docs run: |