diff options
| -rwxr-xr-x | .travis.compiler.sh | 4 | ||||
| -rw-r--r-- | .travis.yml | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/.travis.compiler.sh b/.travis.compiler.sh index 6058d95a170..13e35fffe87 100755 --- a/.travis.compiler.sh +++ b/.travis.compiler.sh @@ -8,8 +8,8 @@ if [[ "${TRAVIS_OS_NAME}" == 'linux' ]]; then CMAKE_OPT="${CMAKE_OPT} -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache" fi case ${GCC_VERSION} in - 5) CXX=clang++-3.9 ;; - 6) CXX=clang++-4.0 ;; + 5) CXX=clang++-4.0 ;; + 6) CXX=clang++-5.0 ;; esac export CXX CC=${CXX/++/} elif [[ "${CXX}" == 'g++' ]]; then diff --git a/.travis.yml b/.travis.yml index 639a720fa3d..f3253b5e1a9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -136,18 +136,17 @@ addons: apt: sources: - ubuntu-toolchain-r-test - - llvm-toolchain-trusty - - llvm-toolchain-trusty-3.9 - llvm-toolchain-trusty-4.0 + - sourceline: 'deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-5.0 main' packages: # make sure these match the build requirements - gcc-5 - g++-5 - gcc-6 - g++-6 - - clang-3.9 - - llvm-3.9-dev - clang-4.0 - llvm-4.0-dev + - clang-5.0 + - llvm-5.0-dev - libasan0 - bison - chrpath |