From 553181787fdcde3ce0918909deebedefce7bf68c Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Tue, 14 Jun 2016 18:28:51 +0100 Subject: [PATCH] more Travis fix --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 15a66f0..a7dcd36 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,6 +46,7 @@ matrix: sources: - ubuntu-toolchain-r-test packages: + - g++-4.8 - libgsl0-dev - flex - bison @@ -56,6 +57,7 @@ matrix: sources: - ubuntu-toolchain-r-test packages: + - g++-4.8 - libgsl0-dev - flex - bison @@ -64,15 +66,15 @@ matrix: before_install: - export LATDIR=`pwd` - cd ci-scripts - - if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$CC" == "clang" ]] && [ ! -e clang/bin ]; then wget $CLANG_LINK; tar -xf `basename $CLANG_LINK`; mkdir clang; mv clang+*/* clang/; pwd; ls; ls clang; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$CC" == "clang" ]] && [ ! -e clang/bin ]; then wget $CLANG_LINK; tar -xf `basename $CLANG_LINK`; mkdir clang; mv clang+*/* clang/; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$CC" == "clang" ]]; then export PATH="${LATDIR}/ci-scripts/clang/bin:${PATH}"; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$CC" == "clang" ]]; then export LD_LIBRARY_PATH="${LATDIR}/ci-scripts/clang/lib:${LD_LIBRARY_PATH}"; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install gsl; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install bison flex; export PATH="/usr/local/opt/flex/bin:/usr/local/opt/bison/bin:$PATH"; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$CC" == "gcc" ]]; then brew install gcc5; fi install: - - ls /home/travis/build/aportelli/LatAnalyze/ci-scripts/clang/bin - export CC=$CC$VERSION - export CXX=$CXX$VERSION - echo $PATH