From 795512af11b3fc9b5ba6dcdf50c9ed7fe96cce3f Mon Sep 17 00:00:00 2001
From: Michael Rapp <michael.rapp90@googlemail.com>
Date: Sun, 12 Nov 2023 14:36:40 +0100
Subject: [PATCH] Rename cache keys used by Github workflows.

---
 .github/workflows/test_build.yml  | 30 +++++++++++-------------------
 .github/workflows/test_format.yml | 10 ++++------
 2 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/test_build.yml b/.github/workflows/test_build.yml
index 2bc950c236..68121cdf3e 100644
--- a/.github/workflows/test_build.yml
+++ b/.github/workflows/test_build.yml
@@ -23,11 +23,9 @@ jobs:
         uses: actions/cache/restore@v3
         with:
           path: .git/
-          key: test-build-git
+          key: test-build-cache-git
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          path: .
       - name: Detect changes
         uses: dorny/paths-filter@v2
         id: filter
@@ -62,7 +60,7 @@ jobs:
         if: success() || failure()
         with:
           path: .git/
-          key: test-build-git
+          key: test-build-cache-git
   linux_build:
     needs: changes
     if: ${{ needs.changes.outputs.any == 'true' }}
@@ -73,11 +71,9 @@ jobs:
         uses: actions/cache/restore@v3
         with:
           path: .git/
-          key: test-build-git
+          key: test-build-cache-git
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          path: .
       - name: Install OpenCL
         run: |
           sudo apt update
@@ -98,7 +94,7 @@ jobs:
             - doc/_build/
             - doc/_extra/
             - doc/development/api/python/
-          key: ${{ runner.os }}-test-build-tmp-files
+          key: ${{ runner.os }}-test-build-cache-tmp-files
       - name: Test C++ code
         if: ${{ needs.changes.outputs.cpp_tests == 'true' }}
         run: ./build tests_cpp
@@ -135,7 +131,7 @@ jobs:
             - doc/_build/
             - doc/_extra/
             - doc/development/api/python/
-          key: ${{ runner.os }}-test-build-tmp-files
+          key: ${{ runner.os }}-test-build-cache-tmp-files
   macos_build:
     needs: changes
     if: ${{ needs.changes.outputs.cpp == 'true' }}
@@ -146,11 +142,9 @@ jobs:
         uses: actions/cache/restore@v3
         with:
           path: .git/
-          key: test-build-git
+          key: test-build-cache-git
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          path: .
       - name: Install OpenMP
         run: |
           brew install libomp
@@ -164,7 +158,7 @@ jobs:
             - venv/
             - scons/build/
             - cpp/build/
-          key: ${{ runner.os }}-test-build-tmp-files
+          key: ${{ runner.os }}-test-build-cache-tmp-files
       - name: Compile via Clang
         run: TEST_SUPPORT=disabled CPLUS_INCLUDE_PATH=/usr/local/opt/opencl-clhpp-headers/include ./build compile
       - name: Save build files to cache
@@ -175,7 +169,7 @@ jobs:
             - venv/
             - scons/build/
             - cpp/build/
-          key: ${{ runner.os }}-test-build-tmp-files
+          key: ${{ runner.os }}-test-build-cache-tmp-files
   windows_build:
     needs: changes
     if: ${{ needs.changes.outputs.cpp == 'true' }}
@@ -187,11 +181,9 @@ jobs:
         with:
           enableCrossOsArchive: true
           path: .git/
-          key: test-build-git
+          key: test-build-cache-git
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          path: .
       - name: Prepare MSVC
         uses: ilammy/msvc-dev-cmd@v1
       - name: Remove conflicting link.exe
@@ -211,7 +203,7 @@ jobs:
             - venv/
             - scons/build/
             - cpp/build/
-          key: ${{ runner.os }}-test-build-tmp-files
+          key: ${{ runner.os }}-test-build-cache-tmp-files
       - name: Compile via MSVC
         run: |
           $env:TEST_SUPPORT = "disabled"
@@ -226,4 +218,4 @@ jobs:
             - venv/
             - scons/build/
             - cpp/build/
-          key: ${{ runner.os }}-test-build-tmp-files
+          key: ${{ runner.os }}-test-build-cache-tmp-files
diff --git a/.github/workflows/test_format.yml b/.github/workflows/test_format.yml
index 85c97d6939..fd78adc17c 100644
--- a/.github/workflows/test_format.yml
+++ b/.github/workflows/test_format.yml
@@ -20,11 +20,9 @@ jobs:
         uses: actions/cache/restore@v3
         with:
           path: .git/
-          key: test-format-git
+          key: test-format-cache-git
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          path: .
       - name: Detect changes
         uses: dorny/paths-filter@v2
         id: filter
@@ -51,7 +49,7 @@ jobs:
           path: |
             - venv/
             - scons/build/
-          key: test-format-tmp-files
+          key: test-format-cache-tmp-files
       - name: Check C++ code style
         if: steps.filter.outputs.cpp == 'true'
         run: ./build test_format_cpp
@@ -65,10 +63,10 @@ jobs:
           path: |
             - venv/
             - scons/build/
-          key: test-format-tmp-files
+          key: test-format-cache-tmp-files
       - name: Save Git repository to cache
         uses: actions/cache/save@v3
         if: success() || failure()
         with:
           path: .git/
-          key: test-format-git
+          key: test-format-cache-git