Skip to content

test #1889

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 21, 2016
Merged

test #1889

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,19 +44,19 @@ env:
- LD_LIBRARY_PATH="$HOME/bogus/lib"
matrix:
- GCC_VERSION=default
- GCC_VERSION=5
- GCC_VERSION=6

# Install dependencies for the verbs and usnic providers. Open MPI is
# not currently using the verbs provider in Libfabric, so we might as
# well not build it.
before_install:
- if [[ "GCC_VERSION" == "5" ]]; then COMPILERS="CC=gcc-5 CXX=g++-5 FC=gfortran-5"; fi
- if [[ "GCC_VERSION" == "6" ]]; then COMPILERS="CC=gcc-6 CXX=g++-6 FC=gfortran-6"; fi
- export CONFIGURE_ARGS="--prefix=$HOME/bogus $COMPILERS" DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_ARGS"
- export DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_ARGS"
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then git clone https://github.com/ofiwg/libfabric.git ; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$GCC_VERSION" == "5" ]] ; then sudo apt-get --assume-yes install gcc-5 g++-5 gfortran-5; 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" == "5" ]] ; then brew update; brew unlink gcc ; brew install gcc; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$GCC_VERSION" == "6" ]] ; then brew update; brew upgrade automake libtool gcc; fi
Copy link
Contributor Author

@ggouaillardet ggouaillardet Jul 20, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jsquyres we can either
brew upgrade, it will upgrade everything and is safe, or
brew upgrade automake libtool gcc.
the latter is faster (elapsed time is reduced from 29 min to 23 min), but the command might fail if some packages are already up-to-date, we might run into this if travis folks provide OS X images with up-to-date brew.

i have no strong opinion on which is best.

brew now comes with gcc-6.1.0, so i updated from gcc-5 (and friends) to gcc-6 and friends

- mkdir -p $HOME/bogus/include $HOME/bogus/lib

# Note that we use "make -k" to do the entire build, even if there was a
Expand All @@ -78,5 +78,5 @@ script:

matrix:
exclude:
- env: GCC_VERSION=5
- env: GCC_VERSION=6
compiler: clang