From af7fd57b45aebf9abd98794fe704f65089f88eef Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Wed, 21 Sep 2016 13:40:34 +0900 Subject: [PATCH] travis: always run 'brew update; brew upgrade automake libtool' on OSX --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index daf40cf53d..e79eadc1fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,7 +56,8 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then git clone https://github.com/ofiwg/libfabric.git ; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$GCC_VERSION" == "6" ]] ; then sudo apt-get --assume-yes install gcc-6 g++-6 gfortran-6; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cd libfabric && ./autogen.sh && ./configure --prefix=$HOME/bogus --enable-usnic --disable-verbs $COMPILERS && make install && cd .. ; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$GCC_VERSION" == "6" ]] ; then brew update; brew upgrade automake libtool gcc; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew upgrade automake libtool; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$GCC_VERSION" == "6" ]] ; then brew upgrade gcc; fi - mkdir -p $HOME/bogus/include $HOME/bogus/lib # Note that we use "make -k" to do the entire build, even if there was a