fabi/Snappy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Travis CI configuration.

Browse Source
This commit is contained in:
costan
2018-08-06 12:58:32 -07:00
committed by Victor Costan
parent be490ef9ec
commit 4ffb0e62c5
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.travis.yml
View File

@@ -30,12 +30,12 @@ addons:
# https://github.com/travis-ci/apt-source-whitelist/blob/master/ubuntu.json # https://github.com/travis-ci/apt-source-whitelist/blob/master/ubuntu.json
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- llvm-toolchain-trusty-5.0 - llvm-toolchain-trusty-6.0
packages: packages:
- cmake - cmake
- gcc-7 - gcc-8
- g++-7 - g++-8
- clang-5.0 - clang-6.0
install: install:
# Travis doesn't have a DSL for installing homebrew packages yet. Status tracked # Travis doesn't have a DSL for installing homebrew packages yet. Status tracked
@@ -47,10 +47,10 @@ install:
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then - if [ "$TRAVIS_OS_NAME" == "osx" ]; then
brew update; brew update;
if [ -L /usr/local/include/c++ ]; then rm /usr/local/include/c++; fi; if [ -L /usr/local/include/c++ ]; then rm /usr/local/include/c++; fi;
brew install gcc@7; brew install gcc@8;
fi fi
# /usr/bin/gcc is stuck to old versions on both Linux and OSX. # /usr/bin/gcc is stuck to old versions on both Linux and OSX.
- if [ "$CXX" = "g++" ]; then export CXX="g++-7" CC="gcc-7"; fi - if [ "$CXX" = "g++" ]; then export CXX="g++-8" CC="gcc-8"; fi
- echo ${CC} - echo ${CC}
- echo ${CXX} - echo ${CXX}
- ${CXX} --version - ${CXX} --version