From 1292f926d9a3f9f92fda2bd858d1258f96bc517b Mon Sep 17 00:00:00 2001
From: Bruno Alexandre Rosa <1791393+brunoalr@users.noreply.github.com>
Date: Mon, 2 Mar 2026 22:21:08 -0300
Subject: [PATCH 1/2] ci: remove stale ccache

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

diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index e95898097..29278e183 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -202,6 +202,12 @@ jobs:
                   --ccache "$CCACHE_SIZE" $NO_CLIENT
           .ci/name_build.sh
 
+      - name: Delete stale ccache
+        if: github.ref == 'refs/heads/master'
+        env:
+          GH_TOKEN: ${{github.token}}
+        run: gh cache delete "${{ steps.ccache_restore.outputs.cache-primary-key }}" || true
+
       - name: Save compiler cache (ccache)
         if: github.ref == 'refs/heads/master'
         uses: actions/cache/save@v5
@@ -443,14 +449,18 @@ jobs:
           TARGET_MACOS_VERSION: ${{ matrix.override_target }}
         run: .ci/compile.sh --server --test --vcpkg
 
+      - name: Delete stale ccache
+        if: github.ref == 'refs/heads/master' && matrix.use_ccache == 1
+        env:
+          GH_TOKEN: ${{github.token}}
+        run: gh cache delete "${{ steps.ccache_restore.outputs.cache-primary-key }}" || true
+
       - name: Save compiler cache (ccache)
         if: github.ref == 'refs/heads/master' && matrix.use_ccache == 1
         uses: actions/cache/save@v5
-        env:
-          BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
         with:
           path: ${{env.CCACHE_DIR}}
-          key: ccache-${{matrix.runner}}-${{matrix.soc}}-${{matrix.type}}-${{env.BRANCH_NAME}}
+          key: ${{ steps.ccache_restore.outputs.cache-primary-key }}
 
       - name: Sign app bundle
         if: matrix.os == 'macOS' && matrix.make_package && (github.ref == 'refs/heads/master' || needs.configure.outputs.tag != null)

From 84f7a00d3f344a3c10e07252fa2820dabbcd98e2 Mon Sep 17 00:00:00 2001
From: Bruno Alexandre Rosa <1791393+brunoalr@users.noreply.github.com>
Date: Mon, 2 Mar 2026 22:42:28 -0300
Subject: [PATCH 2/2] add warning messages

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

diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index 29278e183..5543d60cf 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -202,11 +202,12 @@ jobs:
                   --ccache "$CCACHE_SIZE" $NO_CLIENT
           .ci/name_build.sh
 
+      # Delete stale ccache so Save can refresh it; failures are non-fatal (e.g. no prior cache)
       - name: Delete stale ccache
         if: github.ref == 'refs/heads/master'
         env:
           GH_TOKEN: ${{github.token}}
-        run: gh cache delete "${{ steps.ccache_restore.outputs.cache-primary-key }}" || true
+        run: gh cache delete "${{ steps.ccache_restore.outputs.cache-primary-key }}" || echo "warning: cache delete failed"
 
       - name: Save compiler cache (ccache)
         if: github.ref == 'refs/heads/master'
@@ -449,11 +450,12 @@ jobs:
           TARGET_MACOS_VERSION: ${{ matrix.override_target }}
         run: .ci/compile.sh --server --test --vcpkg
 
+      # Delete stale ccache so Save can refresh it; failures are non-fatal (e.g. no prior cache)
       - name: Delete stale ccache
         if: github.ref == 'refs/heads/master' && matrix.use_ccache == 1
         env:
           GH_TOKEN: ${{github.token}}
-        run: gh cache delete "${{ steps.ccache_restore.outputs.cache-primary-key }}" || true
+        run: gh cache delete "${{ steps.ccache_restore.outputs.cache-primary-key }}" || echo "warning: cache delete failed"
 
       - name: Save compiler cache (ccache)
         if: github.ref == 'refs/heads/master' && matrix.use_ccache == 1