From ff4e2913dacd182c46c454b105472da19f5b8100 Mon Sep 17 00:00:00 2001
From: Denis Rouzaud <denis.rouzaud@gmail.com>
Date: Sat, 2 Mar 2024 08:10:31 +0100
Subject: [PATCH] simplify cache id

---
 .github/workflows/macos-build.yml     | 4 ++--
 .github/workflows/mingw-w64-msys2.yml | 4 ++--
 .github/workflows/mingw64.yml         | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/macos-build.yml b/.github/workflows/macos-build.yml
index dae2d1badee3..6d385a8d245a 100644
--- a/.github/workflows/macos-build.yml
+++ b/.github/workflows/macos-build.yml
@@ -42,7 +42,7 @@ jobs:
         uses: actions/cache/restore@v3
         with:
           path: ${{ env.CCACHE_DIR }}
-          key: build-ccache-mac-${{ github.base_ref || github.ref }}
+          key: build-ccache-mac-${{ github.event.pull_request.base.ref || github.ref_name }}
           restore-keys: |
             build-ccache-mac-refs/heads/master
 
@@ -135,4 +135,4 @@ jobs:
         if: ${{ github.event_name == 'push' }}
         with:
           path: ${{ env.CCACHE_DIR }}
-          key: build-ccache-mac-${{ github.ref }}
+          key: build-ccache-mac-${{ github.ref_name }}
diff --git a/.github/workflows/mingw-w64-msys2.yml b/.github/workflows/mingw-w64-msys2.yml
index b3924396309c..019941cbc28c 100644
--- a/.github/workflows/mingw-w64-msys2.yml
+++ b/.github/workflows/mingw-w64-msys2.yml
@@ -59,7 +59,7 @@ jobs:
         uses: actions/cache/restore@v3
         with:
           path: build
-          key: build-ccache-mingw64-msys2-${{ github.base_ref || github.ref }}
+          key: build-ccache-mingw64-msys2-${{ github.event.pull_request.base.ref || github.ref_name }}
           restore-keys: |
             build-ccache-mingw64-msys2-refs/heads/master
 
@@ -91,4 +91,4 @@ jobs:
         if: ${{ github.event_name == 'push' }}
         with:
           path: build
-          key: build-ccache-mingw64-msys2-${{ github.ref }}
+          key: build-ccache-mingw64-msys2-${{ github.ref_name }}
diff --git a/.github/workflows/mingw64.yml b/.github/workflows/mingw64.yml
index c318152181e0..15b6cdfd2b33 100644
--- a/.github/workflows/mingw64.yml
+++ b/.github/workflows/mingw64.yml
@@ -67,7 +67,7 @@ jobs:
         uses: actions/cache/restore@v3
         with:
           path: /w/.ccache/QGIS
-          key: build-ccache-mingw64-${{ github.base_ref || github.ref }}
+          key: build-ccache-mingw64-${{ github.event.pull_request.base.ref || github.ref_name }}
           restore-keys: |
             build-ccache-mingw64-refs/heads/master-
 
@@ -79,7 +79,7 @@ jobs:
         if: ${{ github.event_name == 'push' }}
         with:
           path: /w/.ccache/QGIS
-          key: build-ccache-mingw64-${{ github.ref }}
+          key: build-ccache-mingw64-${{ github.ref_name }}
 
       - name: Create Portable zip
         run: |