From 8321c9f302eb6c38a62b759373a5966a26b3e328 Mon Sep 17 00:00:00 2001 From: Anne Jan Brouwer Date: Mon, 13 Mar 2017 15:02:12 +0100 Subject: Gcc6 ? --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5ebbfaec..a02d4b4b 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" && "$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" && "$CC" = "gcc" ]]; then sudo apt-get -qq install g++-6 gcc-6; fi +- if [[ "$TRAVIS_OS_NAME" = "linux" && "$CC" = "gcc" ]]; then sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-6 60 --slave /usr/bin/g++ g++ /usr/bin/g++-6; fi +- if [[ "$TRAVIS_OS_NAME" = "linux" && "$CC" = "gcc" ]]; then sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-6 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 -- cgit v1.2.3