diff options
| -rwxr-xr-x | .gitlab/gen_ci.hs | 13 | ||||
| -rw-r--r-- | .gitlab/jobs.yaml | 42 |
2 files changed, 21 insertions, 34 deletions
diff --git a/.gitlab/gen_ci.hs b/.gitlab/gen_ci.hs index aaaa721090..9be71acef7 100755 --- a/.gitlab/gen_ci.hs +++ b/.gitlab/gen_ci.hs @@ -590,11 +590,16 @@ job arch opsys buildConfig = (jobName, Job {..}) ,"junit.xml"] } - jobCache = Cache - { cachePaths = [ "cabal-cache", "toolchain" ] - , cacheKey = mkCacheKey arch opsys + jobCache + -- N.B. We have temporarily disabled cabal-install store caching on + -- Windows due to #21347. + | Windows <- opsys = + Cache { cachePaths = [], cacheKey = "no-caching" } + | otherwise = Cache + { cachePaths = [ "cabal-cache", "toolchain" ] + , cacheKey = mkCacheKey arch opsys - } + } jobAllowFailure = False jobStage = "full-build" diff --git a/.gitlab/jobs.yaml b/.gitlab/jobs.yaml index e918c25e7c..a43dcd42f6 100644 --- a/.gitlab/jobs.yaml +++ b/.gitlab/jobs.yaml @@ -1492,11 +1492,8 @@ } }, "cache": { - "key": "x86_64-windows-$CACHE_REV", - "paths": [ - "cabal-cache", - "toolchain" - ] + "key": "no-caching", + "paths": [] }, "dependencies": [], "image": null, @@ -1553,11 +1550,8 @@ } }, "cache": { - "key": "x86_64-windows-$CACHE_REV", - "paths": [ - "cabal-cache", - "toolchain" - ] + "key": "no-caching", + "paths": [] }, "dependencies": [], "image": null, @@ -2521,11 +2515,8 @@ } }, "cache": { - "key": "x86_64-windows-$CACHE_REV", - "paths": [ - "cabal-cache", - "toolchain" - ] + "key": "no-caching", + "paths": [] }, "dependencies": [], "image": null, @@ -2583,11 +2574,8 @@ } }, "cache": { - "key": "x86_64-windows-$CACHE_REV", - "paths": [ - "cabal-cache", - "toolchain" - ] + "key": "no-caching", + "paths": [] }, "dependencies": [], "image": null, @@ -3637,11 +3625,8 @@ } }, "cache": { - "key": "x86_64-windows-$CACHE_REV", - "paths": [ - "cabal-cache", - "toolchain" - ] + "key": "no-caching", + "paths": [] }, "dependencies": [], "image": null, @@ -3697,11 +3682,8 @@ } }, "cache": { - "key": "x86_64-windows-$CACHE_REV", - "paths": [ - "cabal-cache", - "toolchain" - ] + "key": "no-caching", + "paths": [] }, "dependencies": [], "image": null, |