From f41bffb3ddebad7bfb7eb903252ac93a936ab5e5 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Wed, 24 May 2017 15:39:43 -0700 Subject: [PATCH] travis: clang-3.6 -> clang-4.0 Summary: just realised when I updated the .travis.yml to trusty the llvm repo was still precise. Update this and clang-4.0. Closes https://github.com/facebook/rocksdb/pull/2127 Differential Revision: D4869427 Pulled By: sagar0 fbshipit-source-id: b7f906b6fac28e60cacc6a1f1959d6acf8269906 --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 15a787c2a7..175466d04c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,8 +15,8 @@ cache: addons: apt: - sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.6'] - packages: ['clang-3.6' , 'g++-6', 'zlib1g-dev', 'libbz2-dev', 'libsnappy-dev', 'curl', 'libgflags-dev', 'mingw-w64'] + sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-4.0'] + packages: ['clang-4.0' , 'g++-6', 'zlib1g-dev', 'libbz2-dev', 'libsnappy-dev', 'curl', 'libgflags-dev', 'mingw-w64'] env: - TEST_GROUP=platform_dependent1 - TEST_GROUP=platform_dependent2 @@ -47,7 +47,7 @@ matrix: compiler: clang before_script: - - if [[ "${TRAVIS_OS_NAME}" == 'linux' && "${CXX}" == 'clang++' ]]; then CXX=clang++-3.6; fi + - if [[ "${TRAVIS_OS_NAME}" == 'linux' && "${CXX}" == 'clang++' ]]; then CXX=clang++-4.0; fi # test one linux g++ build with g++-6 - if [[ "${TRAVIS_OS_NAME}" == 'linux' && "${CXX}" == 'g++' && "${JOB_NAME}" == 'unittests' ]]; then CXX=g++-6; fi # Limit the maximum number of open file descriptors to 8192