diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-07-17 11:03:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-17 11:03:53 -0400 |
| commit | 291c3c6ff3eadd26e364787600fd4606cb5b1f40 (patch) | |
| tree | 60e1f063aec3c10c66eb127ba49628857af8166c | |
| parent | 7fa1baf44e7877b7b6b861c7140b006d4cee79f3 (diff) | |
| parent | f639c97c7200972bf44d01b48891c45707b43a17 (diff) | |
| download | rneovim-291c3c6ff3eadd26e364787600fd4606cb5b1f40.tar.gz rneovim-291c3c6ff3eadd26e364787600fd4606cb5b1f40.tar.bz2 rneovim-291c3c6ff3eadd26e364787600fd4606cb5b1f40.zip | |
Merge #5077 from fwalch/travis/fix-gcov
Travis: Fix coveralls upload.
| -rwxr-xr-x | .ci/after_success.sh | 6 | ||||
| -rw-r--r-- | .travis.yml | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/.ci/after_success.sh b/.ci/after_success.sh index 580b988061..0215eb139b 100755 --- a/.ci/after_success.sh +++ b/.ci/after_success.sh @@ -3,8 +3,6 @@ set -e set -o pipefail -if [[ -n "${CI_TARGET}" ]]; then - exit +if [[ -n "${GCOV}" ]]; then + coveralls --gcov "$(which "${GCOV}")" --encoding iso-8859-1 || echo 'coveralls upload failed.' fi - -[ "$USE_GCOV" = on ] && { coveralls --gcov "$(which "${GCOV}")" --encoding iso-8859-1 || echo 'coveralls upload failed.' ; } diff --git a/.travis.yml b/.travis.yml index 8334b03cdf..9d529c2632 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,6 +61,7 @@ matrix: env: CI_TARGET=lint - os: linux compiler: gcc-5 + env: GCOV=gcov-5 CMAKE_FLAGS="$CMAKE_FLAGS -DUSE_GCOV=ON" - os: linux compiler: gcc-5 env: FUNCTIONALTEST=functionaltest-lua @@ -72,7 +73,7 @@ matrix: env: BUILD_32BIT=ON - os: linux compiler: clang - env: GCOV=llvm-cov CLANG_SANITIZER=ASAN_UBSAN CMAKE_FLAGS="$CMAKE_FLAGS -DUSE_GCOV=ON" + env: CLANG_SANITIZER=ASAN_UBSAN - os: linux compiler: clang env: CLANG_SANITIZER=TSAN |