From d79b2f66d96bc1f0fd498191cef5051c6ccc5576 Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Sun, 16 Aug 2026 20:38:46 +0200
Subject: [PATCH] reduce cache churn and race conditions between matrix runs
 better

---
 .github/workflows/desktop-build.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index b77ea5c4b..4759aefee 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -318,13 +318,12 @@ jobs:
 
             ccache_eviction_age: 7d
             cmake_generator: Ninja
-            make_package: 1
             package_suffix: "-macOS26"
             qt_version: 6.11.0
             qt_arch: clang_64
             qt_modules: qtimageformats qtmultimedia qtwebsockets
             soc: Apple
-            type: Release
+            type: Debug
             use_ccache: 1
             xcode: "26.6"
 
@@ -373,9 +372,9 @@ jobs:
         env:
           BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
         with:
-          key: ccache-${{ matrix.runner }}-${{ matrix.soc }}-${{ matrix.type }}-${{ env.BRANCH_NAME }}
+          key: ccache-${{ matrix.runner }}_${{ matrix.override_target }}-Xcode${{ matrix.xcode }}-${{ matrix.soc }}-${{ matrix.type }}-${{ env.BRANCH_NAME }}
           path: ${{ env.CCACHE_DIR }}
-          restore-keys: ccache-${{ matrix.runner }}-${{ matrix.soc }}-${{ matrix.type }}-
+          restore-keys: ccache-${{ matrix.runner }}_${{ matrix.override_target }}-Xcode${{ matrix.xcode }}-${{ matrix.soc }}-${{ matrix.type }}-
 
       - name: "Install aqtinstall"
         run: pipx install aqtinstall