diff options
| author | Anne Jan Brouwer <brouwer@annejan.com> | 2017-03-13 14:51:16 +0100 |
|---|---|---|
| committer | Anne Jan Brouwer <brouwer@annejan.com> | 2017-03-13 14:51:16 +0100 |
| commit | b1cfae720560b79c032fb18a2b70501605c4fb01 (patch) | |
| tree | 28d67c4ce34552056b55bf3e7044b5bd0f3e5650 | |
| parent | fde1bbd5d37e4fc4b98cc551bd96bce2ccd472d1 (diff) | |
Try only doing the GCC 5 trick on gcc ;)
| -rw-r--r-- | .travis.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 469384c6..a4ee4ba1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,9 +31,9 @@ install: - if [ "$TRAVIS_OS_NAME" = "osx" ]; then npm install -g appdmg; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq update; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq install qt58base qt58tools qt58svg; fi -- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq install g++-5 gcc-5; fi -- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 60 --slave /usr/bin/g++ g++ /usr/bin/g++-5; fi -- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-5 90; fi +- if [ "$TRAVIS_OS_NAME" = "linux" && "$CC" = "gcc" ]; then sudo apt-get -qq install g++-5 gcc-5; fi +- if [ "$TRAVIS_OS_NAME" = "linux" && "$CC" = "gcc" ]; then sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 60 --slave /usr/bin/g++ g++ /usr/bin/g++-5; fi +- if [ "$TRAVIS_OS_NAME" = "linux" && "$CC" = "gcc" ]; then sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-5 90; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then pip install --user codecov; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then gem install coveralls-lcov; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq install lcov; fi |