diff options
Diffstat (limited to 'ci/common/build.sh')
| -rw-r--r-- | ci/common/build.sh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ci/common/build.sh b/ci/common/build.sh index 5b719940ab..a3cf64d47a 100644 --- a/ci/common/build.sh +++ b/ci/common/build.sh @@ -26,13 +26,16 @@ build_deps() { DEPS_CMAKE_FLAGS="${DEPS_CMAKE_FLAGS} -DUSE_BUNDLED_LUA=ON" fi - rm -rf "${DEPS_BUILD_DIR}" mkdir -p "${DEPS_BUILD_DIR}" + mkdir -p "${DEPS_DOWNLOAD_DIR}" # Use cached dependencies if $CACHE_MARKER exists. - if test -f "${CACHE_MARKER}" && ! test "${CACHE_ENABLE}" = "false" ; then + if test "${CACHE_ENABLE}" = "false" ; then + export CCACHE_RECACHE=1 + elif test -f "${CACHE_MARKER}" ; then echo "Using third-party dependencies from Travis cache (last update: $(_stat "${CACHE_MARKER}"))." - cp -r "${HOME}/.cache/nvim-deps" "${DEPS_BUILD_DIR}" + cp -r "${HOME}/.cache/nvim-deps"/. "${DEPS_BUILD_DIR}" + cp -r "${HOME}/.cache/nvim-deps-downloads" "${DEPS_DOWNLOAD_DIR}" fi # Even if we're using cached dependencies, run CMake and make to |