ci: update .travis.yml
Change-Id: I5194c8791099bb7ee722873c56fb2e70f72588c9
diff --git a/.travis.yml b/.travis.yml
index ddc43d7..7606e89 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,5 @@
language: cpp
dist: xenial
-sudo: required
env:
global:
- WAF_JOBS=2
@@ -21,10 +20,6 @@
# Linux/clang
# https://apt.llvm.org/
- os: linux
- env: COMPILER=clang++-3.6
- - os: linux
- env: COMPILER=clang++-3.7 DISABLE_ASAN=yes
- - os: linux
env: COMPILER=clang++-3.8
- os: linux
env: COMPILER=clang++-3.9
@@ -34,13 +29,17 @@
env: COMPILER=clang++-5.0
- os: linux
env: COMPILER=clang++-6.0
+ # temporarily disable AddressSanitizer on clang-7 and later
+ # due to https://bugs.llvm.org/show_bug.cgi?id=40808
- os: linux
- env: COMPILER=clang++-7
+ env: COMPILER=clang++-7 DISABLE_ASAN=yes
- os: linux
- env: COMPILER=clang++-8
+ env: COMPILER=clang++-8 DISABLE_ASAN=yes
+ - os: linux
+ env: COMPILER=clang++-9 DISABLE_ASAN=yes
# macOS/clang
- # https://docs.travis-ci.com/user/reference/osx/#OS-X-Version
+ # https://docs.travis-ci.com/user/reference/osx/#macos-version
- os: osx
osx_image: xcode8.3
env: OSX_VERSION=10.12
@@ -53,17 +52,20 @@
- os: osx
osx_image: xcode10.1
env: OSX_VERSION=10.13
+ - os: osx
+ osx_image: xcode10.2
+ env: OSX_VERSION=10.14
allow_failures:
- - env: COMPILER=clang++-3.6
- - env: COMPILER=clang++-3.7 DISABLE_ASAN=yes
- - env: COMPILER=clang++-8
+ - env: COMPILER=clang++-9 DISABLE_ASAN=yes
fast_finish: true
install: |
case ${COMPILER} in
- g++-[6789])
+ g++-5)
+ ;;
+ g++-*)
travis_retry sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
travis_retry sudo apt-get -qq update
travis_retry sudo apt-get -qy install "${COMPILER}"
@@ -72,7 +74,7 @@
CLANG_VERSION=${COMPILER/clang++}
if [[ ${CLANG_VERSION} != "-3."* ]]; then
travis_retry wget -nv -O - "https://apt.llvm.org/llvm-snapshot.gpg.key" | sudo apt-key add -
- travis_retry sudo add-apt-repository -y "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial${CLANG_VERSION/-8} main"
+ travis_retry sudo add-apt-repository -y "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial${CLANG_VERSION/-9} main"
fi
travis_retry sudo apt-get -qq update
travis_retry sudo apt-get -qy install "clang${CLANG_VERSION}"