diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-06-01 02:04:40 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-06-01 02:04:40 -0400 |
| commit | c16cb06656393de57760ec0a4442b6e92ffaac6e (patch) | |
| tree | 7f6a4140ca2b3a0455e3fbb4de251cd91f8f26c1 | |
| parent | 4adee66980c79f19bd8f2d3cd26dfac28ab48879 (diff) | |
| parent | b121d85376a0f29f6858a85fa39efbee003fc596 (diff) | |
| download | rneovim-c16cb06656393de57760ec0a4442b6e92ffaac6e.tar.gz rneovim-c16cb06656393de57760ec0a4442b6e92ffaac6e.tar.bz2 rneovim-c16cb06656393de57760ec0a4442b6e92ffaac6e.zip | |
Merge pull request #4859 from justinmk/travisllvm
travis: remove LLVM apt PPA; fallback to clang 3.4
| -rw-r--r-- | .travis.yml | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index 985a5c5381..1158acf076 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ env: # Update PATH for pip and MinGW. - PATH="$(python2.7 -c 'import site; print(site.getuserbase())')/bin:$HOME/.local/mingw32/bin:$PATH" # LLVM symbolizer path. - - LLVM_SYMBOLIZER="$(which llvm-symbolizer-3.6)" + - LLVM_SYMBOLIZER="$(which llvm-symbolizer-3.4)" # Build directory for Neovim. - BUILD_DIR="$TRAVIS_BUILD_DIR/build" # Build directory for third-party dependencies. @@ -72,13 +72,13 @@ matrix: compiler: gcc-5 -m32 env: BUILD_32BIT=ON - os: linux - compiler: clang-3.6 - env: GCOV=llvm-cov-3.6 CLANG_SANITIZER=ASAN_UBSAN CMAKE_FLAGS="$CMAKE_FLAGS -DUSE_GCOV=ON" + compiler: clang + env: GCOV=llvm-cov CLANG_SANITIZER=ASAN_UBSAN CMAKE_FLAGS="$CMAKE_FLAGS -DUSE_GCOV=ON" - os: linux - compiler: clang-3.6 + compiler: clang env: CLANG_SANITIZER=MSAN - os: linux - compiler: clang-3.6 + compiler: clang env: CLANG_SANITIZER=TSAN - os: osx compiler: clang @@ -103,13 +103,12 @@ addons: sources: # TODO: Remove PPA when Travis gets Python >=3.3. - deadsnakes - - llvm-toolchain-precise-3.6 - ubuntu-toolchain-r-test packages: - autoconf - automake - build-essential - - clang-3.6 + - clang-3.4 - cmake - g++-5-multilib - g++-multilib @@ -118,7 +117,7 @@ addons: - gdb - libc6-dev-i386 - libtool - - llvm-3.6-dev + - llvm-3.4-dev - pkg-config - python3.3-dev - unzip |