diff options
Diffstat (limited to 'ci')
-rwxr-xr-x | ci/before_cache.sh | 5 | ||||
-rwxr-xr-x | ci/before_script.sh | 2 | ||||
-rwxr-xr-x | ci/install.sh | 2 | ||||
-rwxr-xr-x | ci/run_tests.sh | 2 |
4 files changed, 4 insertions, 7 deletions
diff --git a/ci/before_cache.sh b/ci/before_cache.sh index d7405bab19..7bf66221ae 100755 --- a/ci/before_cache.sh +++ b/ci/before_cache.sh @@ -7,10 +7,7 @@ CI_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" # shellcheck source-path=SCRIPTDIR source "${CI_DIR}/common/suite.sh" -mkdir -p "${HOME}/.cache" - -echo "before_cache.sh: cache size" -du -chd 1 "${HOME}/.cache" | sort -rh | head -20 +mkdir -p "$CACHE_DIR" # Update the third-party dependency cache only if the build was successful. if ended_successfully && [ -d "${DEPS_BUILD_DIR}" ]; then diff --git a/ci/before_script.sh b/ci/before_script.sh index 4a95e5a60f..3e8adcfb15 100755 --- a/ci/before_script.sh +++ b/ci/before_script.sh @@ -10,7 +10,7 @@ if [[ -n "${GCOV}" ]] && [[ ! $(type -P "${GCOV}") ]]; then fi if test "${FUNCTIONALTEST}" = "functionaltest-lua" ; then - DEPS_CMAKE_FLAGS="${DEPS_CMAKE_FLAGS} -DUSE_BUNDLED_LUA=ON" + DEPS_CMAKE_FLAGS="${DEPS_CMAKE_FLAGS} -D USE_BUNDLED_LUA=ON" fi mkdir -p "${DEPS_BUILD_DIR}" diff --git a/ci/install.sh b/ci/install.sh index 5925cc7b02..d65c86032b 100755 --- a/ci/install.sh +++ b/ci/install.sh @@ -8,7 +8,7 @@ echo "Install neovim module for Python." CC=cc python3 -m pip -q install --user --upgrade pynvim echo "Install neovim RubyGem." -gem install --no-document --bindir "$HOME/.local/bin" --user-install --pre neovim +gem install --no-document --bindir "$BIN_DIR" --user-install --pre neovim echo "Install neovim npm package" npm install -g neovim diff --git a/ci/run_tests.sh b/ci/run_tests.sh index c692d859d7..0d39627dac 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -13,7 +13,7 @@ build_nvim() { check_core_dumps --delete quiet if test -n "${CLANG_SANITIZER}" ; then - CMAKE_FLAGS="${CMAKE_FLAGS} -DCLANG_${CLANG_SANITIZER}=ON" + CMAKE_FLAGS="${CMAKE_FLAGS} -D CLANG_${CLANG_SANITIZER}=ON" fi mkdir -p "${BUILD_DIR}" |