diff options
Diffstat (limited to 'ci/common')
| -rw-r--r-- | ci/common/build.sh | 15 | ||||
| -rwxr-xr-x | ci/common/submit_coverage.sh | 11 |
2 files changed, 11 insertions, 15 deletions
diff --git a/ci/common/build.sh b/ci/common/build.sh index 8e9b2f8ebb..0024f2cbd5 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}" @@ -92,12 +86,3 @@ build_nvim() { cd "${TRAVIS_BUILD_DIR}" } - -macos_rvm_dance() { - # neovim-ruby gem requires a ruby newer than the macOS default. - source ~/.rvm/scripts/rvm - rvm get stable --auto-dotfiles - rvm reload - rvm use 2.2.5 - rvm use -} 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 |