Skip to content

Commit

Permalink
Upgrade conan in conan package jobs
Browse files Browse the repository at this point in the history
The minimum version of conan we can support can change depending on
what our dependencies require, so there's no point in testing our
conan builds against a particular version of conan.  Therefore we've
decided to just always build against the latest version of conan.
  • Loading branch information
bfairservice-gt committed Dec 22, 2021
1 parent 3fa58fc commit fcd7e11
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .ci/gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ conan-linux-gcc7:
needs: [check-format]
image: $DOCKER_REGISTRY/rewriting/gtirb/ubuntu18
script: &conan-build
- python3 -m pip install conan
- python3 -m pip install --upgrade conan
- conan profile new default --detect
- conan profile update settings.compiler.libcxx=libstdc++11 default
- export PYTHONPATH="$(pwd)"
Expand All @@ -311,7 +311,7 @@ conan-linux-gcc9:
- systeminfo
- export PATH="C:\\Program Files\\Python38;$PATH"
# Install conan
- python -m pip install conan
- python -m pip install --upgrade conan
# Run build script
- export PYTHONPATH="$(cygpath -w $(pwd))"
- export PATH="$PATH;C:\\Program Files\\CMake\\bin"
Expand Down Expand Up @@ -340,7 +340,7 @@ conan-windows-32:
- systeminfo
- export PATH="C:\\Program Files\\Python38;$PATH"
# Install conan
- python -m pip install conan
- python -m pip install --upgrade conan
# Run build script
- export PYTHONPATH="$(cygpath -w $(pwd))"
- export PATH="$PATH;C:\\Program Files\\CMake\\bin"
Expand Down

0 comments on commit fcd7e11

Please sign in to comment.