From 4aeb2fa2b637979f48dd30b33a1eba8a11c3c90f Mon Sep 17 00:00:00 2001
From: Harald Sitter <sitter@kde.org>
Date: Wed, 1 Jul 2026 15:20:48 +0200
Subject: [PATCH] add cache overrides so we hit our server

---
 build.sh         |  6 ++++++
 buildstream.conf | 55 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+)
 create mode 100644 buildstream.conf

diff --git a/build.sh b/build.sh
index 8b11e68..d95d398 100755
--- a/build.sh
+++ b/build.sh
@@ -93,6 +93,12 @@ rm --recursive --force etc-factory
 git clone https://invent.kde.org/kde-linux/etc-factory
 DESTDIR=$PWD/mkosi.extra make --directory=etc-factory install
 
+if [ "${KDECI_BUILD:-}" = "TRUE" ]; then
+    # Set up cache overrides
+    mkdir --parents ~/.config
+    cp buildstream.conf ~/.config/buildstream.conf
+fi
+
 BST="bst"
 rm -rf "$BUILDSTREAM_ROOTFS" "$BUILDSTREAM_BOOTFS" "$BUILDSTREAM_TOOLFS" "$BUILDSTREAM_EFI"
 $BST build os/filesystem.bst
diff --git a/buildstream.conf b/buildstream.conf
new file mode 100644
index 0000000..6b4751e
--- /dev/null
+++ b/buildstream.conf
@@ -0,0 +1,55 @@
+# SPDX-License-Identifier: CC0-1.0
+# SPDX-FileCopyrightText: none
+
+# The user configuration for CI builds.
+# https://docs.buildstream.build/master/using_config.html
+
+projects:
+  freedesktop-sdk:
+    # - Augment fd-sdk with our own caches as well so that we can catch objects that have fallen out of the remote cache or aren't there yet.
+    # - As a fallback try to use our proxy cache for fd-sdk
+    artifacts:
+      override-project-caches: true
+      servers:
+        - url: https://buildstream.cache.kde-linux.haraldsitter.eu:11001
+        - url: https://freedesktop.buildstream.cache.kde-linux.haraldsitter.eu
+    source-caches:
+      override-project-caches: true
+      servers:
+        - url: https://buildstream.cache.kde-linux.haraldsitter.eu:11001
+        - url: https://freedesktop.buildstream.cache.kde-linux.haraldsitter.eu
+  gnome:
+    # - Augment gnome with our own caches as well so that we can catch objects that have fallen out of the remote cache or aren't there yet.
+    # - As a fallback try to use our proxy cache for gnome
+    artifacts:
+      override-project-caches: true
+      servers:
+        - url: https://buildstream.cache.kde-linux.haraldsitter.eu:11001
+        - url: https://gnome.buildstream.cache.kde-linux.haraldsitter.eu
+    source-caches:
+      override-project-caches: true
+      servers:
+        - url: https://buildstream.cache.kde-linux.haraldsitter.eu:11001
+        - url: https://gnome.buildstream.cache.kde-linux.haraldsitter.eu
+  kde:
+    artifacts:
+      override-project-caches: true
+      servers:
+        - url: https://buildstream.cache.kde-linux.haraldsitter.eu:11001
+    source-caches:
+      override-project-caches: true
+      servers:
+        - url: https://buildstream.cache.kde-linux.haraldsitter.eu:11001
+  kde-linux:
+    artifacts:
+      override-project-caches: true
+      servers:
+        - url: https://buildstream.cache.kde-linux.haraldsitter.eu:11001
+    source-caches:
+      override-project-caches: true
+      servers:
+        - url: https://buildstream.cache.kde-linux.haraldsitter.eu:11001
+
+logging:
+  # Be more verbose when things fail. In particular the kde-builder issue may be a ways back in the log.
+  error-lines: 1000