From 874fa79a8d513c7d77c60d93ca5d0f83d4ebee08 Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Date: Thu, 21 Mar 2024 17:36:40 +0200
Subject: [PATCH] CI: Use per-build cache keys

---
 .github/workflows/build.yml           | 1 +
 .github/workflows/reusable-tsan.yml   | 1 +
 .github/workflows/reusable-ubuntu.yml | 1 +
 .github/workflows/reusable-wasi.yml   | 1 +
 4 files changed, 4 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 54ef0d6a425e37..72056af5c04ba7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -474,6 +474,7 @@ jobs:
       uses: hendrikmuhs/ccache-action@v1.2
       with:
         save: ${{ github.event_name == 'push' }}
+        key: ${{ github.workflow }}-${{ github.job }}
         max-size: "200M"
     - name: Configure CPython
       run: ./configure --config-cache --with-address-sanitizer --without-pymalloc
diff --git a/.github/workflows/reusable-tsan.yml b/.github/workflows/reusable-tsan.yml
index 96a9c1b0cda3c3..33571393084950 100644
--- a/.github/workflows/reusable-tsan.yml
+++ b/.github/workflows/reusable-tsan.yml
@@ -40,6 +40,7 @@ jobs:
       uses: hendrikmuhs/ccache-action@v1.2
       with:
         save: ${{ github.event_name == 'push' }}
+        key: ${{ github.workflow }}-${{ github.job }}
         max-size: "200M"
     - name: Configure CPython
       run: ${{ inputs.options }}
diff --git a/.github/workflows/reusable-ubuntu.yml b/.github/workflows/reusable-ubuntu.yml
index ee64fe62a0bd0a..7929a10b32a393 100644
--- a/.github/workflows/reusable-ubuntu.yml
+++ b/.github/workflows/reusable-ubuntu.yml
@@ -43,6 +43,7 @@ jobs:
       uses: hendrikmuhs/ccache-action@v1.2
       with:
         save: ${{ github.event_name == 'push' }}
+        key: ${{ github.workflow }}-${{ github.job }}
         max-size: "200M"
     - name: Setup directory envs for out-of-tree builds
       run: |
diff --git a/.github/workflows/reusable-wasi.yml b/.github/workflows/reusable-wasi.yml
index 60eef7bc478bbf..8a9ed9a3735bce 100644
--- a/.github/workflows/reusable-wasi.yml
+++ b/.github/workflows/reusable-wasi.yml
@@ -39,6 +39,7 @@ jobs:
       uses: hendrikmuhs/ccache-action@v1.2
       with:
         save: ${{ github.event_name == 'push' }}
+        key: ${{ github.workflow }}-${{ github.job }}
         max-size: "200M"
     - name: "Add ccache to PATH"
       run: echo "PATH=/usr/lib/ccache:$PATH" >> $GITHUB_ENV