diff options
| author |  Alexey Sokolov | 2018-06-19 22:59:28 +0100 |
|---|---|---|
| committer |  IceN9ne | 2018-11-14 08:59:22 -0500 |
| commit | 17563d6d738d55321a5e2ced80d8eeb1305b93fd (patch) | |
| tree | f663e2da6361ff424448c706198c40ffbb698bd5 | |
| parent | AppVeyor: Remove Qt5.9 workaround for 32-bit builds since AppVeyor now uses Q... (diff) | |
| download | KVIrc-17563d6d738d55321a5e2ced80d8eeb1305b93fd.tar.gz KVIrc-17563d6d738d55321a5e2ced80d8eeb1305b93fd.tar.bz2 KVIrc-17563d6d738d55321a5e2ced80d8eeb1305b93fd.zip | |
Travis: use GCC 6
| -rw-r--r-- | .travis.yml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 3c7648bdc..9c72680b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -66,10 +66,12 @@ install: - CMAKE_ARGS="" - | if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then - # want cmake newer than in ubuntu 14.04 - sudo add-apt-repository -y ppa:george-edison55/cmake-3.x + sudo add-apt-repository -y ppa:george-edison55/cmake-3.x # want cmake newer than in ubuntu 14.04 + sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test # for gcc-6 sudo apt-get update - sudo apt-get install -y cmake libperl-dev libenchant-dev qtmultimedia5-dev libqt5webkit5-dev libqt5svg5-dev libqt5x11extras5-dev libphonon4qt5-dev libphonon4qt5experimental-dev + sudo apt-get install -y cmake libperl-dev libenchant-dev qtmultimedia5-dev libqt5webkit5-dev libqt5svg5-dev libqt5x11extras5-dev libphonon4qt5-dev libphonon4qt5experimental-dev g++-6 + sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-6 90 + sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-6 90 if [ -z "$DEBUILD" ] then |