Make Travis use newer gcc

aardappel · Mar 4, 2018 · 423e34e · 423e34e
1 parent b409e2a
commit 423e34e
Showing 1 changed file with 22 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@
 # whitelist
 branches:
   only:
-    - master 
+    - master
     - testing
 
 notifications:
@@ -24,34 +24,42 @@ sudo: required
 
 compiler: gcc
 
-env: 
+env:
   - RMRF_WXWIDGETS="" WXLIB="libwxgtk3.1-dev"
 
-# Here is the build matrix (runtime and enviroment)
 matrix:
   allow_failures:
     - os: linux
       env: RMRF_WXWIDGETS="" WXLIB="libwxgtk3.1-dev"
-  include: 
+  include:
     - os: linux
       env: RMRF_WXWIDGETS="" WXLIB="libwxgtk3.0-dev"
     - os: osx
       osx_image: xcode7.3
       compiler: gcc clang
       env: RMRF_WXWIDGETS="Y" WXLIB="libwxgtk3.1-dev"
-  exclude: 
+  exclude:
     - os: osx
       compiler: gcc
       env: RMRF_WXWIDGETS="" WXLIB="libwxgtk3.1-dev"
 
-# Here is the setup script
+before_install:
+  - if  [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+      sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test;
+      sudo apt-get update -qq;
+    fi
+
 install:
+  - if  [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+      sudo apt-get install -qq g++-6;
+      sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-6 90;
+    fi
   - if  [[ -n "$RMRF_WXWIDGETS" ]]; then rm -rf wxWidgets ; fi
   - if  [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
       if  [[ ! -d wxWidgets ]]; then
-         git submodule init && 
-         git submodule add --depth 1 -f https://github.com/wxWidgets/wxWidgets.git; 
-      fi; 
+         git submodule init &&
+         git submodule add --depth 1 -f https://github.com/wxWidgets/wxWidgets.git;
+      fi;
       git submodule update --depth 1 --recursive;
       if  [[ ! -d wxWidgets/build_osx ]]; then
          mkdir -p wxWidgets/build_osx ;
@@ -62,19 +70,18 @@ install:
       sudo make install &&
       popd ;
     else
-      if  [[ "$WXLIB" = "libwxgtk3.1-dev" ]]; then 
+      if  [[ "$WXLIB" = "libwxgtk3.1-dev" ]]; then
         sudo apt-key adv --fetch-keys http://repos.codelite.org/CodeLite.asc &&
         sudo apt-add-repository 'deb http://repos.codelite.org/wx3.1.0/ubuntu/ trusty universe';
       fi;
-      sudo apt-get update && 
-      sudo apt-get install -y $WXLIB ; 
+      sudo apt-get update &&
+      sudo apt-get install -y $WXLIB ;
     fi
 
-# Here is the test script
 script:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
       xcodebuild -project osx/TreeSheets/TreeSheets.xcodeproj ;
     else
-      cd src && 
-      make -j 4; 
+      cd src &&
+      make -j 4;
     fi