From 332d74bcaf4c4d596a1d05f1891dc53be300b5af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Tue, 2 Jul 2019 18:26:08 +0200 Subject: [PATCH] AppVeyor: Skip saving cache on non-master branches Otherwise we run into situations where commits to stable branches induce very long build times, as they have to basically build from scratch but also invalidate the cache for future commits on the master branch. This commit also makes the cache folder branch-specific, but since it's still limited to 1 GB of total cache size, we don't enable it for non-master, as we would still run into issues with non-master build invalidating the master cache. (cherry picked from commit b021bdbf1f72e0364e49bd506eab61d7ed0d57bf) --- .appveyor.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 12c3e2a735..722b977784 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -12,6 +12,9 @@ environment: TARGET: release_debug ARCH: amd64 +init: + - ps: if ($env:APPVEYOR_REPO_BRANCH -ne "master") { $env:APPVEYOR_CACHE_SKIP_SAVE = "true" } + cache: - "%SCONS_CACHE_ROOT%" @@ -26,7 +29,7 @@ before_build: - python --version - scons --version - cl.exe - - SET "SCONS_CACHE=%SCONS_CACHE_ROOT%\2.1" + - set "SCONS_CACHE=%SCONS_CACHE_ROOT%\%APPVEYOR_REPO_BRANCH%" build_script: -- scons platform=%GD_PLATFORM% target=%TARGET% tools=%TOOLS% verbose=yes progress=no + - scons platform=%GD_PLATFORM% target=%TARGET% tools=%TOOLS% verbose=yes progress=no