Browse Source
.travis.yml: Adding comments to default gcc/clang versions. Unifying call to brew update with removal of custom c++ executable.
pull/384/head
David Runge
7 years ago
1 changed files with 3 additions and 4 deletions
Unified View
Diff Options
-
+3 -4.travis.yml
+ 3
- 4
.travis.yml
View File
| @@ -40,11 +40,11 @@ matrix: | |||||
| env: | env: | ||||
| - MATRIX_EVAL="CC=gcc-6 CXX=g++-6" | - MATRIX_EVAL="CC=gcc-6 CXX=g++-6" | ||||
| compiler: gcc | compiler: gcc | ||||
| # linux with gcc (default) | |||||
| # linux with gcc default (4.8) | |||||
| - os: linux | - os: linux | ||||
| dist: trusty | dist: trusty | ||||
| compiler: gcc | compiler: gcc | ||||
| # linux with clang (default) | |||||
| # linux with clang default (3.5) | |||||
| - os: linux | - os: linux | ||||
| dist: trusty | dist: trusty | ||||
| compiler: clang | compiler: clang | ||||
| @@ -89,8 +89,7 @@ matrix: | |||||
| before_install: | before_install: | ||||
| - eval "${MATRIX_EVAL}" | - eval "${MATRIX_EVAL}" | ||||
| - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi | |||||
| - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo rm /usr/local/include/c++; fi | |||||
| - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update && sudo rm /usr/local/include/c++; fi | |||||
| - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get -qq update; fi | - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get -qq update; fi | ||||
| install: | install: | ||||