From b0e5187e49caf4c33e5d72d299b353336ae1450c Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Fri, 16 Mar 2018 07:09:52 +0100
Subject: ci/travis: Don't destroy cache during prepare

This change was missed in c7f95fde1bb1.
ref #5166
---
 ci/common/build.sh | 1 -
 1 file changed, 1 deletion(-)

(limited to 'ci')

diff --git a/ci/common/build.sh b/ci/common/build.sh
index 5b719940ab..7d9767f460 100644
--- a/ci/common/build.sh
+++ b/ci/common/build.sh
@@ -26,7 +26,6 @@ build_deps() {
     DEPS_CMAKE_FLAGS="${DEPS_CMAKE_FLAGS} -DUSE_BUNDLED_LUA=ON"
   fi
 
-  rm -rf "${DEPS_BUILD_DIR}"
   mkdir -p "${DEPS_BUILD_DIR}"
 
   # Use cached dependencies if $CACHE_MARKER exists.
-- 
cgit 


From 8f82f95c1c8355228a3d405c8a135a4acb008969 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Fri, 16 Mar 2018 07:29:43 +0100
Subject: ci/travis: also cache $DEPS_DOWNLOAD_DIR

ref #5166
---
 ci/before_cache.sh | 4 ++++
 ci/common/build.sh | 2 ++
 2 files changed, 6 insertions(+)

(limited to 'ci')

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
-- 
cgit 


From 66a8b593e76a9f0d4a4381139a54590fed354638 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sun, 18 Mar 2018 01:04:53 +0100
Subject: ci/travis: report cache size

---
 ci/before_cache.sh | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'ci')

diff --git a/ci/before_cache.sh b/ci/before_cache.sh
index 2a5c6cfff0..d99b8e68c6 100755
--- a/ci/before_cache.sh
+++ b/ci/before_cache.sh
@@ -11,6 +11,9 @@ source "${CI_DIR}/common/suite.sh"
 rm -rf "${HOME}/.cache/pip/log"
 rm -f "${HOME}/.cache/pip/selfcheck.json"
 
+echo "before_cache.sh: cache size"
+du -d 2 "${HOME}/.cache" | sort -n
+
 # Update the third-party dependency cache only if the build was successful.
 if ended_successfully; then
   rm -rf "${HOME}/.cache/nvim-deps"
-- 
cgit