From a1878c461a0054794124931fc5c0260317dd339f Mon Sep 17 00:00:00 2001 From: Kim Grasman Date: Mon, 23 Apr 2018 22:36:42 +0200 Subject: [PATCH] Use LLVM 6.0 for clang_6.0 branch --- .travis.yml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index f8c4f66cb..7ad2b42b8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,24 +5,21 @@ addons: apt: sources: - ubuntu-toolchain-r-test - - llvm-toolchain-trusty + - llvm-toolchain-trusty-6.0 packages: - ninja-build - - llvm-dev - - libclang-dev - - clang + - llvm-6.0-dev + - libclang-6.0-dev + - clang-6.0 before_install: # Install a supported cmake version (>= 3.4.3) - wget -O cmake.sh https://cmake.org/files/v3.10/cmake-3.10.0-rc1-Linux-x86_64.sh - sudo sh cmake.sh --skip-license --exclude-subdir --prefix=/usr/local - # Extract the version number from the most-recently installed LLVM - - VERSION=`ls -t /usr/lib/ | grep '^llvm-' | head -n 1 | sed -E 's/llvm-(.+)/\1/'` - # Absolute paths to LLVM's root and bin directory - - ROOT_PATH=`llvm-config-$VERSION --prefix` - - BIN_PATH=`llvm-config-$VERSION --bindir` + - ROOT_PATH=`llvm-config-6.0 --prefix` + - BIN_PATH=`llvm-config-6.0 --bindir` script: # Build IWYU