From 2d285e86f97fb2486c5da25ddf53f325c875c624 Mon Sep 17 00:00:00 2001 From: matta adrien <matta@lpccaen.in2p3.fr> Date: Tue, 11 Oct 2016 09:32:00 +0200 Subject: [PATCH] * Switching travis server to Ubuntu 14 - Hopefully less package to install and a faster build --- .travis.yml | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 709033c3a..f93fb5b37 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,29 +1,26 @@ +sudo: required +dist: trusty language: cpp os: - linux -# - osx compiler: - gcc before_install: # Linux - - if [ ["$TRAVIS_OS_NAME" == "linux"] && ["$CXX" == "g++"] ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi +# - if [ ["$TRAVIS_OS_NAME" == "linux"] && ["$CXX" == "g++"] ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu/ trusty main universe"; fi - - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install software-properties-common; fi - - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo add-apt-repository -y ppa:george-edison55/cmake-3.x; fi - - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update -qq; fi - - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install --only-upgrade cmake -qq; fi +# - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install software-properties-common; fi +# - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo add-apt-repository -y ppa:george-edison55/cmake-3.x; fi +# - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update -qq; fi +# - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install --only-upgrade cmake -qq; fi - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install root-system -qq; fi - - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get clean; fi +# - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get clean; fi - if [ "$TRAVIS_OS_NAME" == "linux" ]; then cd && wget https://www.dropbox.com/s/8hxjkd6twdsv5fi/geant4_install_new.tar.gz; fi - if [ "$TRAVIS_OS_NAME" == "linux" ]; then tar -xf geant4_install_new.tar.gz; fi - if [ "$TRAVIS_OS_NAME" == "linux" ]; then source ~/geant4_install/share/Geant4-10.1.2/geant4make/geant4make.sh; fi - # OSX - - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi - - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install homebrew/science/root; fi - - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install homebrew/science/geant4; fi # Dumping stuff for check - root-config --version -- GitLab