commit 30ff43903ea4ccc62c4237c35daad1580177d4be
author Gabor Gyimesi <gamezbird@gmail.com> Tue Nov 16 12:09:43 2021 +0100
committer Adam Debreceni <adebreceni@apache.org> Tue Nov 16 12:09:43 2021 +0100
tree 41d0c95f67828f7a1b750b8f3c6ab5c6acad60b8
parent e21b641b092911313737f2744589ebc18bbb326c

MINIFICPP-1683 Revert github actions caching changes

Signed-off-by: Adam Debreceni <adebreceni@apache.org>

This closes #1214

.github/workflows/ci.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 81be07c..a1dff22 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,9 +15,10 @@
         uses: actions/cache@v2
         with:
           path: ${{ env.CCACHE_DIR }}
-          key: macos-xcode12.0-ccache-${{github.ref}}
+          key: macos-xcode12.0-ccache-${{github.ref}}-${{github.sha}}
           restore-keys: |
-            macos-xcode12.0-ccache-
+            macos-xcode12.0-ccache-${{github.ref}}-
+            macos-xcode12.0-ccache-refs/heads/main-
       - id: install_dependencies
         run: |
           brew update
@@ -54,9 +55,10 @@
         uses: actions/cache@v2
         with:
           path: ${{ env.CLCACHE_DIR }}
-          key: windows-vs2019-clcache-${{github.ref}}
+          key: windows-vs2019-clcache-${{github.ref}}-${{github.sha}}
           restore-keys: |
-            windows-vs2019-clcache-
+            windows-vs2019-clcache-${{github.ref}}-
+            windows-vs2019-clcache-refs/heads/main-
       - name: Setup PATH
         uses: microsoft/setup-msbuild@v1.0.2
       - id: install-sqliteodbc-driver
@@ -97,9 +99,10 @@
         uses: actions/cache@v2
         with:
           path: ~/.ccache
-          key: ubuntu-20.04-ccache-${{github.ref}}
+          key: ubuntu-20.04-ccache-${{github.ref}}-${{github.sha}}
           restore-keys: |
-            ubuntu-20.04-ccache-
+            ubuntu-20.04-ccache-${{github.ref}}-
+            ubuntu-20.04-ccache-refs/heads/main-
       - id: install_deps
         run: |
           sudo apt update
@@ -136,9 +139,10 @@
         uses: actions/cache@v2
         with:
           path: ~/.ccache
-          key: ubuntu-20.04-all-clang-ccache-${{github.ref}}
+          key: ubuntu-20.04-all-clang-ccache-${{github.ref}}-${{github.sha}}
           restore-keys: |
-            ubuntu-20.04-all-clang-ccache-
+            ubuntu-20.04-all-clang-ccache-${{github.ref}}-
+            ubuntu-20.04-all-clang-ccache-refs/heads/main-
       - id: install_deps
         run: |
           sudo apt update
@@ -166,9 +170,10 @@
         uses: actions/cache@v2
         with:
           path: ~/.ccache
-          key: centos-ccache-${{github.ref}}
+          key: centos-ccache-${{github.ref}}-${{github.sha}}
           restore-keys: |
-            centos-ccache-
+            centos-ccache-${{github.ref}}-
+            centos-ccache-refs/heads/main-
       - id: install_deps
         run: |
           sudo apt update
@@ -187,9 +192,10 @@
         uses: actions/cache@v2
         with:
           path: ~/.ccache
-          key: docker-ccache-${{github.ref}}
+          key: docker-ccache-${{github.ref}}-${{github.sha}}
           restore-keys: |
-            docker-ccache-
+            docker-ccache-${{github.ref}}-
+            docker-ccache-refs/heads/main
       - id: build
         run: |
           if [ -d ~/.ccache ]; then mv ~/.ccache .; fi