Skip to content

Commit

Permalink
install conan from universe to travis
Browse files Browse the repository at this point in the history
  • Loading branch information
rollbear committed Aug 19, 2020
1 parent 1111674 commit b73049a
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ matrix:
- llvm-toolchain-precise-3.7
- ppa:george-edison55/cmake-3.x
packages:
- python3
- g++-6
- clang-3.7
- llvm-3.7-runtime
Expand Down Expand Up @@ -183,6 +182,7 @@ matrix:
- ubuntu-toolchain-r-test
- llvm-toolchain-xenial-8
packages:
- conan
- g++-6
- clang-8
- libc++-8-dev
Expand Down Expand Up @@ -229,6 +229,7 @@ matrix:
sources:
- ubuntu-toolchain-r-test
packages:
- conan
- g++-4.9
- libcurl4-openssl-dev
- libelf-dev
Expand Down Expand Up @@ -320,6 +321,7 @@ matrix:
sources:
- ubuntu-toolchain-r-test
packages:
- conan
- g++-9
- libcurl4-openssl-dev
- libelf-dev
Expand Down Expand Up @@ -390,13 +392,6 @@ install:
which cmake || brew install cmake
which pip3 || brew upgrade python@3 || brew upgrade python@3 || true
fi
- |
if [[ ! -z "${CONAN_COMPILER}" ]]; then
pushd /tmp
wget 'https://dl.bintray.com/conan/installers/conan-ubuntu-64_1_28_1.deb'
dpkg -i conan-ubuntu-64_1_28_1.deb
popd
fi
before_script:
- CXX=${COMPILER} CXXFLAGS=${CXXFLAGS} ./check_errors.sh ||
Expand Down

0 comments on commit b73049a

Please sign in to comment.