Skip to content

Commit

Permalink
travis: use gcc 8
Browse files Browse the repository at this point in the history
  • Loading branch information
devernay committed Jun 9, 2018
1 parent ca76fb0 commit acb8963
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
22 changes: 11 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,23 +43,23 @@ before_install:
- if [ ${TRAVIS_OS_NAME} = "osx" ]; then
brew install fftw || true;
fi

install:
- git submodule update --init --recursive
- if [[ ${COVERITY_BUILD_DISABLED} == 1 ]];
then
exit 0;
fi
- if [ ${TRAVIS_OS_NAME} = "linux" -a "$CC" = "gcc" ];
then
if [ "$BUILDDOC" = 1 ]; then
sudo apt-get install doxygen xsltproc;
fi;
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test;
sudo apt-get update;
sudo apt-get install gcc-7 g++-7;
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 90;
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-7 90;
sudo apt-get install gcc-8 g++-8;
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 90;
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 90;
fi

install:
- if [[ ${COVERITY_BUILD_DISABLED} == 1 ]];
then
exit 0;
fi

# CImg is now downloaded by CImg/Makefile, no need to install it
Expand All @@ -85,8 +85,8 @@ addons:
- ubuntu-toolchain-r-test
packages:
- ca-certificates
- gcc-7
- g++-7
- gcc-8
- g++-8
- libfftw3-dev
coverity_scan:
# customized build script URL
Expand Down
2 changes: 1 addition & 1 deletion openfx
Submodule openfx updated 1 files
+5 −5 .travis.yml

0 comments on commit acb8963

Please sign in to comment.