[PATCH v3 0/1] MR4814: gitlab: Use build64 directory for Clang build.

[Jacek Caban (＠jacek)]

This fixes config.cache caching and avoids spam in logs about removed files and directories.

--
  v3: gitlab: Cache config.cache in Clang builds.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/4814

[PATCH v3 1/1] gitlab: Cache config.cache in Clang builds.

[Jacek Caban]

From: Jacek Caban <jacek(a)codeweavers.com>

---
 tools/gitlab/build-clang |  4 +++-
 tools/gitlab/build.yml   | 29 +++++++++++++++++++++++------
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/tools/gitlab/build-clang b/tools/gitlab/build-clang
index e335faf049c..b93bdf146f3 100755
--- a/tools/gitlab/build-clang
+++ b/tools/gitlab/build-clang
@@ -9,5 +9,7 @@ set -Eeuxo pipefail
 ./tools/make_makefiles
 autoreconf -f
 
-./configure -q --enable-archs=i386,x86_64,aarch64 --with-mingw=clang
+cd build
+../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 75cb4b26945..9337d6c3b43 100644
--- a/tools/gitlab/build.yml
+++ b/tools/gitlab/build.yml
@@ -9,12 +9,6 @@
   cache:
     - paths:
         - ccache/
-    - key:
-        files:
-          - configure.ac
-      paths:
-        - build32/config.cache
-        - build64/config.cache
   before_script:
     - export BASEDIR="$PWD"
     - export CCACHE_BASEDIR="$BASEDIR"
@@ -34,7 +28,15 @@ 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
     - git diff --name-only $CI_MERGE_REQUEST_DIFF_BASE_SHA | sed -re '/\/tests\//!d; s@/tests/.*@/tests/Makefile.in@' |
       (xargs -r ls 2>/dev/null || true) | xargs -r sed '/TESTDLL/!d; s(a).dll@@; s(a).*= *@@' >usr/local/share/wine/winetest.args
@@ -43,7 +45,14 @@ 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
     - ./tools/gitlab/build-clang
 
 build-mac:
@@ -52,12 +61,20 @@ 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:
       - build64/config.log
       - build32/config.log
   script:
+    - mkdir -p build32 build64
     - export PATH="/usr/local/opt/ccache/libexec:$PATH"
     - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./tools/gitlab/build-mac
 
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/4814

[Jacek Caban (＠jacek)]

v3: Using a different build dir than GCC build to avoid cache collisions.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/4814#note_57009