From 0c3981e0c32876735395ab6978adf7ecf694f73e Mon Sep 17 00:00:00 2001 From: paboyle Date: Fri, 5 May 2017 21:15:22 +0100 Subject: [PATCH] Trying to force recent automake --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c1545364..fcfc7d9d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ matrix: compiler: clang - compiler: gcc sudo: required + dist: trusty addons: apt: sources: @@ -26,6 +27,7 @@ matrix: env: VERSION=-4.9 - compiler: gcc sudo: required + dist: trusty addons: apt: sources: @@ -73,8 +75,6 @@ before_install: - 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="${GRIDDIR}/clang/bin:${PATH}"; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$CC" == "clang" ]]; then export LD_LIBRARY_PATH="${GRIDDIR}/clang/lib:${LD_LIBRARY_PATH}"; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]] ; then sudo apt-get autoremove automake; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]] ; then sudo apt-get install automake; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install libmpc; fi