Skip to content

Commit db57278

Browse files
committed
Conan build configuration simplified.
1 parent 22515b5 commit db57278

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- env: COMPILER=clang-7
2323
- env: COMPILER=clang-6
2424
- env: COMPILER=clang-5
25-
- env: CONAN_GCC_VERSIONS=9 CONAN_DOCKER_IMAGE=conanio/gcc9
25+
- env: CONAN_GCC_VERSIONS=9
2626

2727

2828
before_install:

script/conan_build.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,7 @@
22

33
set -ex
44

5+
export CONAN_DOCKER_IMAGE=conanio/gcc${CONAN_GCC_VERSIONS}
6+
57
pip install -U conan conan_package_tools
68
python build.py

0 commit comments

Comments
 (0)