From 8f82f95c1c8355228a3d405c8a135a4acb008969 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Fri, 16 Mar 2018 07:29:43 +0100 Subject: [PATCH] ci/travis: also cache $DEPS_DOWNLOAD_DIR ref #5166 --- .travis.yml | 1 + ci/before_cache.sh | 4 ++++ ci/common/build.sh | 2 ++ 3 files changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index 451b89888d..3cd21170b7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -121,6 +121,7 @@ cache: directories: - "$HOME/.cache/pip" - "$HOME/.cache/nvim-deps" + - "$HOME/.cache/nvim-deps-downloads" notifications: webhooks: 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