diff --git a/.travis.yml b/.travis.yml index ddf03015..adfba74d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,13 +27,6 @@ addons: &clang35 - ubuntu-toolchain-r-test - llvm-toolchain-precise-3.5 -addons: &clang6 - apt: - packages: - - clang-6.0 - sources: - - ubuntu-toolchain-r-test - - llvm-toolchain-trusty-6.0 matrix: @@ -60,14 +53,12 @@ matrix: os: linux addons: *clang35 - # Test clang-6.0: C++11, Build=Debug, ASAN=On - - env: CLANG_VERSION=6.0 BUILD_TYPE=Debug CPP=11 ASAN=On TSAN=Off - os: linux - addons: *clang6 + # Test clang-7.0: C++11, Build=Debug, ASAN=On + - env: CLANG_VERSION=7.0 BUILD_TYPE=Debug CPP=11 ASAN=On TSAN=Off + os: linux - - env: CLANG_VERSION=6.0 BUILD_TYPE=Release CPP=11 ASAN=On TSAN=Off - os: linux - addons: *clang6 + - env: CLANG_VERSION=7.0 BUILD_TYPE=Release CPP=11 ASAN=On TSAN=Off + os: linux # osx - env: BUILD_TYPE=Release CPP=11 ASAN=Off TSAN=Off