diff options
Diffstat (limited to 'ci')
-rwxr-xr-x | ci/before_cache.sh | 5 | ||||
-rwxr-xr-x | ci/before_script.sh | 5 | ||||
-rw-r--r-- | ci/build.ps1 | 2 | ||||
-rw-r--r-- | ci/common/build.sh | 4 |
4 files changed, 3 insertions, 13 deletions
diff --git a/ci/before_cache.sh b/ci/before_cache.sh index bec6c37bbe..9bc9bb45e9 100755 --- a/ci/before_cache.sh +++ b/ci/before_cache.sh @@ -12,11 +12,6 @@ mkdir -p "${HOME}/.cache" echo "before_cache.sh: cache size" du -chd 1 "${HOME}/.cache" | sort -rh | head -20 -echo "before_cache.sh: ccache stats" -ccache -s 2>/dev/null || true -# Do not keep ccache stats (uploaded to cache otherwise; reset initially anyway). -find "${HOME}/.ccache" -name stats -delete - # Update the third-party dependency cache only if the build was successful. if ended_successfully && [ -d "${DEPS_BUILD_DIR}" ]; then # Do not cache downloads. They should not be needed with up-to-date deps. diff --git a/ci/before_script.sh b/ci/before_script.sh index f7216338d4..08e0cb9103 100755 --- a/ci/before_script.sh +++ b/ci/before_script.sh @@ -16,11 +16,6 @@ if [[ -n "${LLVM_SYMBOLIZER}" ]] && [[ ! $(type -P "${LLVM_SYMBOLIZER}") ]]; the exit 1 fi -echo "before_script.sh: ccache stats (will be cleared)" -ccache -s -# Reset ccache stats for real results in before_cache. -ccache --zero-stats - # Compile dependencies. build_deps diff --git a/ci/build.ps1 b/ci/build.ps1 index 6c042f9116..6709a9507a 100644 --- a/ci/build.ps1 +++ b/ci/build.ps1 @@ -101,6 +101,8 @@ function Test { # The $LastExitCode from MSBuild can't be trusted
$failed = $false
+ # Run only this test file:
+ # $env:TEST_FILE = "test\functional\foo.lua"
cmake --build $buildDir --target functionaltest 2>&1 |
ForEach-Object { $failed = $failed -or
$_ -match 'functional tests failed with error'; $_ }
diff --git a/ci/common/build.sh b/ci/common/build.sh index f083796a28..6e7ea2c8f8 100644 --- a/ci/common/build.sh +++ b/ci/common/build.sh @@ -24,9 +24,7 @@ build_deps() { mkdir -p "${DEPS_BUILD_DIR}" # Use cached dependencies if $CACHE_MARKER exists. - if test "${CACHE_ENABLE}" = "false" ; then - export CCACHE_RECACHE=1 - elif test -f "${CACHE_MARKER}" ; then + if test -f "${CACHE_MARKER}"; then echo "Using third-party dependencies from cache (last update: $(_stat "${CACHE_MARKER}"))." cp -a "${CACHE_NVIM_DEPS_DIR}"/. "${DEPS_BUILD_DIR}" fi |