diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2022-03-31 13:34:01 +0100 |
|---|---|---|
| committer | Matthew Pickering <matthewtpickering@gmail.com> | 2022-04-01 10:35:59 +0100 |
| commit | a952dd80d40bf6b67194a44ff71d7bf75957d29e (patch) | |
| tree | 03a36e05355ec6fa968e784e85c01ea8d4b7f88d /.gitlab | |
| parent | acfd5a4c4f0a235240a15dc9f4417a11ece5a143 (diff) | |
| download | haskell-a952dd80d40bf6b67194a44ff71d7bf75957d29e.tar.gz | |
ci: Attempt to fix windows cache issues
It appears that running the script directly does nothing (no info is
printed about saving the cache).
Diffstat (limited to '.gitlab')
| -rwxr-xr-x | .gitlab/gen_ci.hs | 7 | ||||
| -rw-r--r-- | .gitlab/jobs.yaml | 30 |
2 files changed, 18 insertions, 19 deletions
diff --git a/.gitlab/gen_ci.hs b/.gitlab/gen_ci.hs index 14cd5cbdf4..aaaa721090 100755 --- a/.gitlab/gen_ci.hs +++ b/.gitlab/gen_ci.hs @@ -559,7 +559,12 @@ job arch opsys buildConfig = (jobName, Job {..}) , ".gitlab/ci.sh test_hadrian" ] - jobAfterScript = + jobAfterScript + | Windows <- opsys = + [ "bash .gitlab/ci.sh save_cache" + , "bash .gitlab/ci.sh clean" + ] + | otherwise = [ ".gitlab/ci.sh save_cache" , ".gitlab/ci.sh clean" , "cat ci_timings" ] diff --git a/.gitlab/jobs.yaml b/.gitlab/jobs.yaml index 90cb8d55a9..e918c25e7c 100644 --- a/.gitlab/jobs.yaml +++ b/.gitlab/jobs.yaml @@ -1477,9 +1477,8 @@ }, "nightly-x86_64-windows-int_native-validate": { "after_script": [ - ".gitlab/ci.sh save_cache", - ".gitlab/ci.sh clean", - "cat ci_timings" + "bash .gitlab/ci.sh save_cache", + "bash .gitlab/ci.sh clean" ], "allow_failure": false, "artifacts": { @@ -1539,9 +1538,8 @@ }, "nightly-x86_64-windows-validate": { "after_script": [ - ".gitlab/ci.sh save_cache", - ".gitlab/ci.sh clean", - "cat ci_timings" + "bash .gitlab/ci.sh save_cache", + "bash .gitlab/ci.sh clean" ], "allow_failure": false, "artifacts": { @@ -2508,9 +2506,8 @@ }, "release-x86_64-windows-int_native-perf": { "after_script": [ - ".gitlab/ci.sh save_cache", - ".gitlab/ci.sh clean", - "cat ci_timings" + "bash .gitlab/ci.sh save_cache", + "bash .gitlab/ci.sh clean" ], "allow_failure": false, "artifacts": { @@ -2571,9 +2568,8 @@ }, "release-x86_64-windows-perf": { "after_script": [ - ".gitlab/ci.sh save_cache", - ".gitlab/ci.sh clean", - "cat ci_timings" + "bash .gitlab/ci.sh save_cache", + "bash .gitlab/ci.sh clean" ], "allow_failure": false, "artifacts": { @@ -3626,9 +3622,8 @@ }, "x86_64-windows-int_native-validate": { "after_script": [ - ".gitlab/ci.sh save_cache", - ".gitlab/ci.sh clean", - "cat ci_timings" + "bash .gitlab/ci.sh save_cache", + "bash .gitlab/ci.sh clean" ], "allow_failure": false, "artifacts": { @@ -3687,9 +3682,8 @@ }, "x86_64-windows-validate": { "after_script": [ - ".gitlab/ci.sh save_cache", - ".gitlab/ci.sh clean", - "cat ci_timings" + "bash .gitlab/ci.sh save_cache", + "bash .gitlab/ci.sh clean" ], "allow_failure": false, "artifacts": { |