diff options
| author | John Fultz <jfultz@wolfram.com> | 2019-01-13 12:51:45 -0600 |
|---|---|---|
| committer | John Fultz <jfultz@wolfram.com> | 2019-01-13 12:51:45 -0600 |
| commit | c691c9bce6680c44171d370dbea4549fa6030322 (patch) | |
| tree | 7cf2daabb9dac416976754bc43cc138c7103cfc4 | |
| parent | 91b9917fce74b2bbfca89a0b26020ce84751be6a (diff) | |
Update TravisCI Linux builds to xenial, so I can get modern compilers for free.
| -rw-r--r-- | .travis.yml | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 2d4a648..b2ef000 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: cpp -dist: trusty +dist: xenial matrix: include: @@ -18,14 +18,10 @@ addons: before_install: - if [ $TRAVIS_OS_NAME = osx ]; then export PATH="/usr/local/opt/qt/bin:$PATH"; fi - - if [ $TRAVIS_OS_NAME = linux ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi - - if [ $TRAVIS_OS_NAME = linux ]; then sudo apt-get update -qq; fi install: - export QT_SELECT=5 - - if [ $TRAVIS_OS_NAME = linux ]; then sudo apt-get install -qq g++-5; fi - - if [ $TRAVIS_OS_NAME = linux ]; then sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-5 90; fi - - if [ $TRAVIS_OS_NAME = linux ]; then sudo apt-get install qtbase5-dev; fi + - if [ $TRAVIS_OS_NAME = linux ]; then sudo apt-get install -y qtbase5-dev; fi script: - qmake -r "QMAKE_CXX=$CXX" "QMAKE_CC=$CC" && make -j 2 |