From 9a1056bd0c5ebad2f358c852a242d04bb7301f84 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Mon, 13 Mar 2023 09:50:40 +0000
Subject: [PATCH] GitHub CI: Remove git SHA from cache key

We're hitting the GitHub cache limit because we create a new cache for
every commit.

Reuse the same cache instead.
---
 .github/workflows/Android.yml           | 5 ++---
 .github/workflows/Linux_x86.yml         | 5 ++---
 .github/workflows/Linux_x86_64_SDL1.yml | 5 ++---
 .github/workflows/Linux_x86_64_test.yml | 3 +--
 .github/workflows/MacOSX.yml            | 5 ++---
 .github/workflows/iOS.yml               | 5 ++---
 6 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/Android.yml b/.github/workflows/Android.yml
index 57a9cdce6..d8929b6ba 100644
--- a/.github/workflows/Android.yml
+++ b/.github/workflows/Android.yml
@@ -35,11 +35,10 @@ jobs:
         cache: gradle
 
     - name: Cache CMake build folder
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: android-project/app/.cxx
-        key: android-cmake-v5-${{ github.sha }}
-        restore-keys: android-cmake-v5-
+        key: ${{ github.workflow }}-v1
 
     - name: Build
       working-directory: ${{github.workspace}}
diff --git a/.github/workflows/Linux_x86.yml b/.github/workflows/Linux_x86.yml
index bc424749b..d44d97001 100644
--- a/.github/workflows/Linux_x86.yml
+++ b/.github/workflows/Linux_x86.yml
@@ -31,11 +31,10 @@ jobs:
         sudo apt-get install -y cmake file g++-multilib git libfmt-dev:i386 libsdl2-dev:i386 libsodium-dev:i386 libpng-dev:i386 libbz2-dev:i386 rpm wget smpq
 
     - name: Cache CMake build folder
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: build
-        key: linux-x86-cmake-v5-${{ github.sha }}
-        restore-keys: linux-x86-cmake-v5-
+        key: ${{ github.workflow }}-v1
 
     - name: Configure CMake
       shell: bash
diff --git a/.github/workflows/Linux_x86_64_SDL1.yml b/.github/workflows/Linux_x86_64_SDL1.yml
index 82752168a..b3eacb21d 100644
--- a/.github/workflows/Linux_x86_64_SDL1.yml
+++ b/.github/workflows/Linux_x86_64_SDL1.yml
@@ -30,11 +30,10 @@ jobs:
         sudo apt-get install -y cmake file g++ git libfmt-dev libsdl1.2-dev libsodium-dev libpng-dev libbz2-dev rpm smpq
 
     - name: Cache CMake build folder
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: build
-        key: linux-x86_64-sdl1-cmake-v5-${{ github.sha }}
-        restore-keys: linux-x86_64-sdl1-cmake-v5-
+        key: ${{ github.workflow }}-v1
 
     - name: Configure CMake
       shell: bash
diff --git a/.github/workflows/Linux_x86_64_test.yml b/.github/workflows/Linux_x86_64_test.yml
index 8cd6c4823..959a95fe5 100644
--- a/.github/workflows/Linux_x86_64_test.yml
+++ b/.github/workflows/Linux_x86_64_test.yml
@@ -33,8 +33,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: build
-          key: linux-x86-64-test-cmake-v2-${{ github.sha }}
-          restore-keys: linux-x86-64-test-cmake-v2-
+          key: ${{ github.workflow }}-v1
       - name: Build tests
         run: |
           cmake -S. -Bbuild -DENABLE_CODECOVERAGE=ON
diff --git a/.github/workflows/MacOSX.yml b/.github/workflows/MacOSX.yml
index 581b0403c..7562c2f23 100644
--- a/.github/workflows/MacOSX.yml
+++ b/.github/workflows/MacOSX.yml
@@ -36,11 +36,10 @@ jobs:
       run: brew bundle install
 
     - name: Cache CMake build folder
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: build
-        key: macos-cmake-v3-${{ github.sha }}
-        restore-keys: macos-cmake-v3-
+        key: ${{ github.workflow }}-v1
 
     - name: Configure CMake
       # Use a bash shell so we can use the same syntax for environment variable
diff --git a/.github/workflows/iOS.yml b/.github/workflows/iOS.yml
index d671aa1dd..8de0ab485 100644
--- a/.github/workflows/iOS.yml
+++ b/.github/workflows/iOS.yml
@@ -33,11 +33,10 @@ jobs:
         fetch-depth: 0
 
     - name: Cache CMake build folder
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: build
-        key: ios-cmake-v3-${{ github.sha }}
-        restore-keys: ios-cmake-v3-
+        key: ${{ github.workflow }}-v1
 
     - name: Configure CMake
       # Use a bash shell so we can use the same syntax for environment variable