Fix

userver-framework · Jan 4, 2025 · e1e3f72 · e1e3f72
1 parent 37867f1
commit e1e3f72
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/.github/workflows/alpine.yml b/.github/workflows/alpine.yml
@@ -63,6 +63,10 @@ jobs:
           - name: Setup ccache
             uses: Chocobo1/setup-ccache-action@v1
             with:
+              override_cache_key: ${{ steps.restore-cache.outputs.cache-matched-key }}
+              override_cache_key_fallback: |
+                alpine-cache-dir ${{github.ref}} run-
+                alpine-cache-dir
               ccache_options: |
                 max_size=3GB
                 cache_dir=${{env.CCACHE_DIR}}

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -130,6 +130,10 @@ jobs:
           - name: Setup ccache
             uses: Chocobo1/setup-ccache-action@v1
             with:
+              override_cache_key: ${{ steps.restore-cache.outputs.cache-matched-key }}
+              override_cache_key_fallback: |
+                ${{matrix.os}} ${{matrix.info}} ccache-dir ${{github.ref}} run-
+                ${{matrix.os}} ${{matrix.info}} ccache-
               ccache_options: |
                 max_size=3GB
                 cache_dir=${{env.CCACHE_DIR}}

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -64,9 +64,15 @@ jobs:
                 brew link postgresql@16 # postgresql is keg-only
 
           - name: Setup ccache
-            run: |
-                ccache -M 2.0GB
-                ccache -s -v
+            uses: Chocobo1/setup-ccache-action@v1
+            with:
+              override_cache_key: ${{ steps.restore-cache.outputs.cache-matched-key }}
+              override_cache_key_fallback: |
+                macos-cache-dir ${{github.ref}} run-
+                macos-cache-dir
+              ccache_options: |
+                max_size=3GB
+                cache_dir=${{env.CCACHE_DIR}}
 
           - name: Run cmake
             run: |