From a952dd80d40bf6b67194a44ff71d7bf75957d29e Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Thu, 31 Mar 2022 13:34:01 +0100
Subject: ci: Attempt to fix windows cache issues

It appears that running the script directly does nothing (no info is
printed about saving the cache).
---
 .gitlab/jobs.yaml | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

(limited to '.gitlab/jobs.yaml')

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": {
-- 
cgit v1.2.1