diff options
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | scripts/linux2/before_install.sh | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 20d4110f8..86fa3c99e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,12 +58,14 @@ matrix: - env: SUBSURFACE_PLATFORM='linux2' os: linux dist: trusty + sudo: required language: c++ addons: apt: sources: - sourceline: 'ppa:beineri/opt-qt-5.10.1-trusty' key_url: 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x10C56D0DE9977759' + - ubuntu-toolchain-r-test packages: - qt510base - qt510connectivity @@ -76,7 +78,8 @@ matrix: - qt510svg - qt510tools - git - - g++ + - gcc-5 + - g++-5 - make - autoconf - automake diff --git a/scripts/linux2/before_install.sh b/scripts/linux2/before_install.sh index 3b0ddceb4..2e82e1156 100644 --- a/scripts/linux2/before_install.sh +++ b/scripts/linux2/before_install.sh @@ -8,6 +8,10 @@ set -x +# make sure we use a new enough compiler +export CC=gcc-5 +export CXX=g++-5 + # Travis only pulls shallow repos. But that messes with git describe. # Sorry Travis, fetching the whole thing and the tags as well... git fetch --unshallow |