diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-03-18 16:47:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-18 16:47:25 +0100 |
| commit | 72e4c9d8e776790e40b2a5911bb702de897fbd12 (patch) | |
| tree | 06362caeb7fb916ced7202c5b71d0d5f3757a304 /ci | |
| parent | f407a94032ae7c3a78aa39c2de02e37d14a5f861 (diff) | |
| parent | 65b66bc332c56c04d4687f11b601a59ddd5d09bd (diff) | |
| download | rneovim-72e4c9d8e776790e40b2a5911bb702de897fbd12.tar.gz rneovim-72e4c9d8e776790e40b2a5911bb702de897fbd12.tar.bz2 rneovim-72e4c9d8e776790e40b2a5911bb702de897fbd12.zip | |
Merge #8142 'build/msvc: fix some warnings'
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/before_cache.sh | 7 | ||||
| -rw-r--r-- | ci/common/build.sh | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ci/before_cache.sh b/ci/before_cache.sh index 2340f4db74..d99b8e68c6 100755 --- a/ci/before_cache.sh +++ b/ci/before_cache.sh @@ -11,10 +11,17 @@ 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" 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 5b719940ab..80973b64c9 100644 --- a/ci/common/build.sh +++ b/ci/common/build.sh @@ -26,13 +26,14 @@ 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 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 |