Skip to content

Commit

Permalink
Update Conan install cmd (update/outdated/cascade)
Browse files Browse the repository at this point in the history
  • Loading branch information
tonyelewis committed May 1, 2021
1 parent 408ada5 commit f0c407c
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
run: cmake -E make_directory ${{github.workspace}}/build

- name: Build Conan dependencies
run: conan install --build missing --install-folder "$GITHUB_WORKSPACE/build" "$GITHUB_WORKSPACE" --profile "$GITHUB_WORKSPACE/.github/conan-profiles/${{ matrix.os }}.${{ matrix.compiler }}.${{ matrix.flavour }}.conan-profile"
run: conan install --update --build outdated --build cascade --install-folder "$GITHUB_WORKSPACE/build" "$GITHUB_WORKSPACE" --profile "$GITHUB_WORKSPACE/.github/conan-profiles/${{ matrix.os }}.${{ matrix.compiler }}.${{ matrix.flavour }}.conan-profile"
shell: bash

- name: Configure CMake
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ ARG BUILD_EXTRA_CATH_TESTS=ON
ARG BUILD_EXTRA_CATH_TOOLS=ON

ADD . /cath-data
RUN conan install --build missing --install-folder docker-build-dir . --profile .github/conan-profiles/ubuntu-20.04.gcc.release.conan-profile
RUN conan install --update --build outdated --build cascade --install-folder docker-build-dir . --profile .github/conan-profiles/ubuntu-20.04.gcc.release.conan-profile
RUN cmake -GNinja -B docker-build-dir -S . -D CMAKE_TOOLCHAIN_FILE:FILEPATH=.github/cmake-toolchain-files/ubuntu-20.04.gcc.release.cmake -D CMAKE_MODULE_PATH:PATH=/cath-data/docker-build-dir
RUN ninja -C docker-build-dir -k 0
RUN ( cd docker-build-dir && ctest -j 6 --output-on-failure )
2 changes: 1 addition & 1 deletion docs/build.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ apt-get install gsl-bin libgsl2:amd64 libgsl-dbg:amd64 libgsl-dev

~~~sh
mkdir build
conan install --build missing --install-folder build .
conan install --update --build outdated --build cascade --install-folder build .
cmake -GNinja -B build -S . -D "CMAKE_MODULE_PATH:PATH=${PWD}/build"
~~~

Expand Down

0 comments on commit f0c407c

Please sign in to comment.