diff options
| author | James McCoy <jamessan@jamessan.com> | 2018-01-01 21:00:07 -0500 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2018-01-02 08:15:31 -0500 |
| commit | 90aae43984ce3b6a5193ce3bc18293c28db6c606 (patch) | |
| tree | a0fa7077320c034d01338d92c56113e774d8728e | |
| parent | 60716371e97dae916c6525e9ba840aae562069bb (diff) | |
| download | rneovim-90aae43984ce3b6a5193ce3bc18293c28db6c606.tar.gz rneovim-90aae43984ce3b6a5193ce3bc18293c28db6c606.tar.bz2 rneovim-90aae43984ce3b6a5193ce3bc18293c28db6c606.zip | |
travis: Use Ubuntu's clang instead of llvm's repo
The llvm repos commonly have access issues, so removing them will
improve stability of the Travis builds.
Filtering check_log's output through asan_symbolize also avoids the
version dance every time a new clang version makes its way into Travis.
| -rw-r--r-- | .travis.yml | 10 | ||||
| -rw-r--r-- | ci/common/test.sh | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 2bab1635ad..35a3c76fce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ env: # http://docs.travis-ci.com/user/speeding-up-the-build/#Paralellizing-your-build-on-one-VM - MAKE_CMD="make -j2" # Update PATH for pip. - - PATH="$(python2.7 -c 'import site; print(site.getuserbase())')/bin:/usr/lib/llvm-symbolizer-4.0/bin:$PATH" + - PATH="$(python2.7 -c 'import site; print(site.getuserbase())')/bin:$PATH" # Build directory for Neovim. - BUILD_DIR="$TRAVIS_BUILD_DIR/build" # Build directory for third-party dependencies. @@ -53,7 +53,7 @@ jobs: include: - stage: sanitizers os: linux - compiler: clang-4.0 + compiler: clang env: > CLANG_SANITIZER=ASAN_UBSAN CMAKE_FLAGS="$CMAKE_FLAGS -DPREFER_LUA=ON" @@ -81,7 +81,7 @@ jobs: compiler: gcc-5 env: GCOV=gcov-5 CMAKE_FLAGS="$CMAKE_FLAGS -DUSE_GCOV=ON" - os: linux - compiler: clang-4.0 + compiler: clang env: CLANG_SANITIZER=TSAN allow_failures: - env: GCOV=gcov-5 CMAKE_FLAGS="$CMAKE_FLAGS -DUSE_GCOV=ON" @@ -99,13 +99,12 @@ addons: apt: sources: - ubuntu-toolchain-r-test - - llvm-toolchain-trusty-4.0 packages: - autoconf - automake - apport - build-essential - - clang-4.0 + - clang - cmake - cscope - g++-5-multilib @@ -116,7 +115,6 @@ addons: - language-pack-tr - libc6-dev-i386 - libtool - - llvm-4.0-dev - locales - pkg-config - unzip diff --git a/ci/common/test.sh b/ci/common/test.sh index 55f76ca798..2de89dee79 100644 --- a/ci/common/test.sh +++ b/ci/common/test.sh @@ -71,7 +71,7 @@ valgrind_check() { } asan_check() { - check_logs "${1}" "*san.*" + check_logs "${1}" "*san.*" | asan_symbolize } run_unittests() {( |