diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2018-03-16 07:29:43 +0100 |
---|---|---|
committer | Justin M. Keyes <justinkz@gmail.com> | 2018-03-18 14:11:38 +0100 |
commit | 8f82f95c1c8355228a3d405c8a135a4acb008969 (patch) | |
tree | 2a839c8037a1869cd1bb039824a736da1b102fec /ci | |
parent | b0e5187e49caf4c33e5d72d299b353336ae1450c (diff) | |
download | rneovim-8f82f95c1c8355228a3d405c8a135a4acb008969.tar.gz rneovim-8f82f95c1c8355228a3d405c8a135a4acb008969.tar.bz2 rneovim-8f82f95c1c8355228a3d405c8a135a4acb008969.zip |
ci/travis: also cache $DEPS_DOWNLOAD_DIR
ref #5166
Diffstat (limited to 'ci')
-rwxr-xr-x | ci/before_cache.sh | 4 | ||||
-rw-r--r-- | ci/common/build.sh | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/ci/before_cache.sh b/ci/before_cache.sh index 2340f4db74..2a5c6cfff0 100755 --- a/ci/before_cache.sh +++ b/ci/before_cache.sh @@ -15,6 +15,10 @@ rm -f "${HOME}/.cache/pip/selfcheck.json" if ended_successfully; then rm -rf "${HOME}/.cache/nvim-deps" mv "${DEPS_BUILD_DIR}" "${HOME}/.cache/nvim-deps" + + rm -rf "${HOME}/.cache/nvim-deps-downloads" + mv "${DEPS_DOWNLOAD_DIR}" "${HOME}/.cache/nvim-deps-downloads" + touch "${CACHE_MARKER}" echo "Updated third-party dependencies (timestamp: $(_stat "${CACHE_MARKER}"))." fi diff --git a/ci/common/build.sh b/ci/common/build.sh index 7d9767f460..80973b64c9 100644 --- a/ci/common/build.sh +++ b/ci/common/build.sh @@ -27,11 +27,13 @@ build_deps() { fi 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 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-downloads" "${DEPS_DOWNLOAD_DIR}" fi # Even if we're using cached dependencies, run CMake and make to |