[PATCH 1/2] gitlab: Use a common configure cache key prefix.

[Rémi Bernon]

From: Rémi Bernon

Partially reverts commit 67f2da2a8d1f219f528bf820b3d6002c5f34d5e4 which
broke ccache cache as the job configurations were overriding the default
cache configuration from .wine-build instead of extending it.
---
 tools/gitlab/build-clang |  2 +-
 tools/gitlab/build.yml   | 30 +++++++++---------------------
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/tools/gitlab/build-clang b/tools/gitlab/build-clang
index b93bdf146f3..3ed87b3b173 100755
--- a/tools/gitlab/build-clang
+++ b/tools/gitlab/build-clang
@@ -9,7 +9,7 @@ set -Eeuxo pipefail
 ./tools/make_makefiles
 autoreconf -f

-cd build
+cd build64
 ../configure -q -C --enable-archs=i386,x86_64,aarch64 --with-mingw=clang
 make -s -j$(nproc)
 cd ..
diff --git a/tools/gitlab/build.yml b/tools/gitlab/build.yml
index 9337d6c3b43..9e5ce467e96 100644
--- a/tools/gitlab/build.yml
+++ b/tools/gitlab/build.yml
@@ -9,6 +9,13 @@
   cache:
     - paths:
         - ccache/
+    - key:
+        files:
+          - configure.ac
+        prefix: $CI_JOB_NAME-config
+      paths:
+        - build32/config.cache
+        - build64/config.cache
   before_script:
     - export BASEDIR="$PWD"
     - export CCACHE_BASEDIR="$BASEDIR"
@@ -28,13 +35,6 @@ build-linux:
     expire_in: 1 day
     paths:
       - usr/local/
-  cache:
-    - key:
-        files:
-          - configure.ac
-      paths:
-        - build32/config.cache
-        - build64/config.cache
   script:
     - mkdir -p build32 build64
     - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./tools/gitlab/build-linux
@@ -45,14 +45,8 @@ build-clang:
   extends: .wine-build
   rules:
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
-  cache:
-    - key:
-        files:
-          - configure.ac
-      paths:
-        - build/config.cache
   script:
-    - mkdir -p build
+    - mkdir -p build32 build64
     - ./tools/gitlab/build-clang

build-mac:
@@ -61,13 +55,6 @@ build-mac:
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
   tags:
     - mac
-  cache:
-    - key:
-        files:
-          - configure.ac
-      paths:
-        - build32/config.cache
-        - build64/config.cache
   artifacts:
     when: on_failure
     paths:
@@ -107,6 +94,7 @@ build-daily-linux:
     paths:
       - usr/local/
   script:
+    - mkdir -p build32 build64
     - ./tools/gitlab/build-linux

build-daily-winetest: