From: Martin Quinson <martin.quinson@loria.fr>
Date: Sat, 28 May 2016 21:41:25 +0000 (+0200)
Subject: travis: Switch to Trusty, and cleanup old workarounds
X-Git-Tag: v3_14~1126
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/c1cab7f24de7c8478b19772a35db38cd8c003aa5

travis: Switch to Trusty, and cleanup old workarounds
---

diff --git a/.travis.yml b/.travis.yml
index 1db3d7bbd2..c1da36a985 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,8 @@
 #   apt-get libns3-dev ns3
 #
 #
+sudo: required
+dist: trusty
 language: cpp
 compiler:
    - gcc
@@ -15,12 +17,14 @@ compiler:
 #                                                                    ^~~~
 #
 addons:
-  apt: # Get recent versions of the compiler, even on Ubuntu Precise
-    sources:
-    - ubuntu-toolchain-r-test
+  apt:
     packages:
-    - gcc-4.7
-    - g++-4.7
+    - cmake
+    - valgrind
+    - default-jdk
+    - gfortran
+    - libboost-dev
+    - libboost-all-dev
   coverity_scan:
     project:
       name: "simgrid/simgrid"
@@ -39,14 +43,7 @@ addons:
 #   - cd ..
 #   - ls -lR $TRAVIS_BUILD_DIR/LuaInstall
 
-# Install libboost-chrono1.48-dev to get boost 1.48 on Ubuntu Precise. What we really want is libboost-dev libboost-all-dev
 # Still need sudo for update-alternatives
-before_install:
-   - if [ ${TRAVIS_OS_NAME} = 'linux' ] ; then sudo add-apt-repository --yes ppa:kubuntu-ppa/backports ; fi # cmake higher than 2.8.7
-   - if [ ${TRAVIS_OS_NAME} = 'linux' ] ; then sudo apt-get update  -qq ; fi
-   - if [ ${TRAVIS_OS_NAME} = 'linux' ] ; then sudo apt-get install -y cmake valgrind default-jdk gfortran libboost-chrono1.48-dev ; fi
-   - if [ ${TRAVIS_OS_NAME} = 'linux' ] ; then sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.7 50 ; fi
-   - if [ ${TRAVIS_OS_NAME} = 'linux' ] ; then sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.7 50 ; fi
 script:
    - cmake -Denable_documentation=OFF -Denable_coverage=OFF -Denable_java=ON -Denable_model-checking=OFF -Denable_lua=OFF -Denable_compile_optimizations=OFF -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=OFF -Denable_compile_warnings=ON . 
    - ./tools/internal/travis-sonarqube.sh make VERBOSE=1 # run make in the sonar wrapper