diff options
| author | William S Fulton <wsf@fultondesigns.co.uk> | 2019-05-02 07:56:42 +0100 |
|---|---|---|
| committer | William S Fulton <wsf@fultondesigns.co.uk> | 2019-05-02 21:57:53 +0100 |
| commit | 48e61eea1d377c4d45526410c486a81dc47a8c58 (patch) | |
| tree | 3814918f4e56af9ecb30b8cd6f4f00ad555f66df /Tools | |
| parent | be019a03ce7df11a748718fb63d47f35a8c297ec (diff) | |
| download | swig-48e61eea1d377c4d45526410c486a81dc47a8c58.tar.gz | |
Travis gcc version refactor
Use GCC env variable to hold gcc version to install instead of SWIG_CC
and SWIG_CXX.
Diffstat (limited to 'Tools')
| -rwxr-xr-x | Tools/travis-linux-install.sh | 18 | ||||
| -rwxr-xr-x | Tools/travis-osx-install.sh | 2 |
2 files changed, 6 insertions, 14 deletions
diff --git a/Tools/travis-linux-install.sh b/Tools/travis-linux-install.sh index b801e2b00..8795229bb 100755 --- a/Tools/travis-linux-install.sh +++ b/Tools/travis-linux-install.sh @@ -1,26 +1,16 @@ #!/bin/bash +# Install Linux packages where the version has been overidden in .travis.yml + set -e # exit on failure (same as -o errexit) lsb_release -a travis_retry sudo apt-get -qq update -if [[ "$CC" == gcc-5 ]]; then - travis_retry sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test - travis_retry sudo apt-get -qq update - travis_retry sudo apt-get install -qq g++-5 -elif [[ "$CC" == gcc-6 ]]; then - travis_retry sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test - travis_retry sudo apt-get -qq update - travis_retry sudo apt-get install -qq g++-6 -elif [[ "$CC" == gcc-7 ]]; then - travis_retry sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test - travis_retry sudo apt-get -qq update - travis_retry sudo apt-get install -qq g++-7 -elif [[ "$CC" == gcc-8 ]]; then +if [[ -n "$GCC" ]]; then travis_retry sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test travis_retry sudo apt-get -qq update - travis_retry sudo apt-get install -qq g++-8 + travis_retry sudo apt-get install -qq g++-$GCC fi travis_retry sudo apt-get -qq install libboost-dev diff --git a/Tools/travis-osx-install.sh b/Tools/travis-osx-install.sh index 6bfb2276a..63a11efa5 100755 --- a/Tools/travis-osx-install.sh +++ b/Tools/travis-osx-install.sh @@ -1,5 +1,7 @@ #!/bin/bash +# Install MacOS packages where the version has been overidden in .travis.yml + set -e # exit on failure (same as -o errexit) sw_vers |