diff options
| author | James McCoy <jamessan@jamessan.com> | 2019-12-15 21:17:16 -0500 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2019-12-15 21:17:16 -0500 |
| commit | 6566251d144d2c9c9e08e05c8c3a3fe9915a19b8 (patch) | |
| tree | 980fd0c7287e295c8ac72858b0794f72224415e0 /ci/common | |
| parent | 9c4223215f71e1212462ada4e698be1b31437dd9 (diff) | |
| parent | 9f3d483c79f03c48239fdc82cc02e8685a03d22a (diff) | |
| download | rneovim-6566251d144d2c9c9e08e05c8c3a3fe9915a19b8.tar.gz rneovim-6566251d144d2c9c9e08e05c8c3a3fe9915a19b8.tar.bz2 rneovim-6566251d144d2c9c9e08e05c8c3a3fe9915a19b8.zip | |
Merge remote-tracking branch 'upstream/master' into libcall
Diffstat (limited to 'ci/common')
| -rw-r--r-- | ci/common/build.sh | 6 | ||||
| -rwxr-xr-x | ci/common/submit_coverage.sh | 11 |
2 files changed, 11 insertions, 6 deletions
diff --git a/ci/common/build.sh b/ci/common/build.sh index 8e9b2f8ebb..02e1110a15 100644 --- a/ci/common/build.sh +++ b/ci/common/build.sh @@ -18,9 +18,6 @@ build_make() { } build_deps() { - if test "${BUILD_32BIT}" = ON ; then - DEPS_CMAKE_FLAGS="${DEPS_CMAKE_FLAGS} ${CMAKE_FLAGS_32BIT}" - fi if test "${FUNCTIONALTEST}" = "functionaltest-lua" \ || test "${CLANG_SANITIZER}" = "ASAN_UBSAN" ; then DEPS_CMAKE_FLAGS="${DEPS_CMAKE_FLAGS} -DUSE_BUNDLED_LUA=ON" @@ -53,9 +50,6 @@ prepare_build() { if test -n "${CLANG_SANITIZER}" ; then CMAKE_FLAGS="${CMAKE_FLAGS} -DCLANG_${CLANG_SANITIZER}=ON" fi - if test "${BUILD_32BIT}" = ON ; then - CMAKE_FLAGS="${CMAKE_FLAGS} ${CMAKE_FLAGS_32BIT}" - fi mkdir -p "${BUILD_DIR}" cd "${BUILD_DIR}" diff --git a/ci/common/submit_coverage.sh b/ci/common/submit_coverage.sh index 4e92975d22..9c7887de0b 100755 --- a/ci/common/submit_coverage.sh +++ b/ci/common/submit_coverage.sh @@ -43,3 +43,14 @@ fi # Cleanup always, especially collected data. find . \( -name '*.gcov' -o -name '*.gcda' \) -ls -delete | wc -l rm -f coverage.xml + +# Upload Lua coverage (generated manually on AppVeyor/Windows). +if [ "$USE_LUACOV" = 1 ] && [ "$1" != "oldtest" ]; then + if [ -x "${DEPS_BUILD_DIR}/usr/bin/luacov" ]; then + "${DEPS_BUILD_DIR}/usr/bin/luacov" + fi + if ! "$codecov_sh" -f luacov.report.out -X gcov -X fix -Z -F "lua,${codecov_flags}"; then + echo "codecov upload failed." + fi + rm luacov.stats.out +fi |