Merge pull request #531 from google/travis_update

TravisCI: Use newer linux images.
This commit is contained in:
Tom Finegan 2019-06-12 14:13:30 -07:00 committed by GitHub
commit 6b80c35ace
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -3,27 +3,17 @@ language: cpp
matrix:
include:
- os: linux
dist: trusty
dist: xenial
compiler: clang
- os: linux
dist: trusty
dist: xenial
compiler: gcc
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-4.9
env:
- MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
- os: osx
osx_image: xcode8.3
compiler: clang
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- ccache
- cmake
@ -31,9 +21,6 @@ addons:
before_install:
- if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then brew update; fi
- if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then brew install ccache; fi
- if [[ "${TRAVIS_OS_NAME}" == "linux" ]] && [[ "${CXX}" = "g++" ]]; then
export CXX="g++-4.9" CC="gcc-4.9";
fi
script:
# Output version info for compilers, cmake, and make