One cache per ref

userver-framework · Jan 6, 2025 · 38556eb · 38556eb
1 parent c1487ba
commit 38556eb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/.github/workflows/alpine.yml b/.github/workflows/alpine.yml
@@ -37,9 +37,9 @@ jobs:
                 path: |
                   ${{env.CCACHE_DIR}}
                   ${{env.CPM_SOURCE_CACHE}}
-                key: 'alpine-cache-dir ${{github.ref}} run-${{github.run_number}}'
+                key: 'alpine-cache-dir ${{github.ref}}'
                 restore-keys: |
-                  alpine-cache-dir ${{github.ref}} run-
+                  alpine-cache-dir ${{github.ref}}
                   alpine-cache-dir
 
           - name: Setup host cache dirs

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -37,6 +37,7 @@ jobs:
                         -DUSERVER_NAMESPACE_END="}}"
                     os: ubuntu-24.04
                     info: clang-18 + debug + sanitize addr+ub
+                    id: ubuntu24_clang18_debug_sanitize-addr-ub
                     tests-flags: ''
 
                   - cmake-flags: >-
@@ -55,6 +56,7 @@ jobs:
                         -DUSERVER_NAMESPACE_END="}}"
                     os: ubuntu-22.04
                     info: clang-14 + debug + sanitize addr+ub
+                    id: ubuntu22_clang14_debug_sanitize-addr-ub
                     tests-flags: ''
 
                   - cmake-flags: >-
@@ -71,6 +73,7 @@ jobs:
                         -DUSERVER_DOWNLOAD_PACKAGE_ABSEIL=0
                     os: ubuntu-20.04
                     info: g++-9 + release
+                    id: ubuntu20_gcc9_release
                     tests-flags: '--gtest_filter=-HttpClient.RedirectHeaders:HttpClient.TestUseIPv4v6'
 
                   # GCC-8 - testing minimal required compiler
@@ -90,6 +93,7 @@ jobs:
                         -DUSERVER_DOWNLOAD_PACKAGE_ABSEIL=0
                     os: ubuntu-20.04
                     info: g++-8 + debug
+                    id: ubuntu20_gcc8_debug
                     tests-flags: '--gtest_filter=-HttpClient.RedirectHeaders:HttpClient.TestUseIPv4v6'
 
         name: '${{matrix.os}}: ${{matrix.info}}'
@@ -107,10 +111,10 @@ jobs:
                 path: |
                   ${{env.CCACHE_DIR}}
                   ${{env.CPM_SOURCE_CACHE}}
-                key: '${{matrix.os}} ${{matrix.info}} ccache-dir ${{github.ref}} run-${{github.run_number}}'
+                key: 'ubuntu-cache-dir ${{matrix.id}} ${{github.ref}}'
                 restore-keys: |
-                    ${{matrix.os}} ${{matrix.info}} ccache-dir ${{github.ref}} run-
-                    ${{matrix.os}} ${{matrix.info}} ccache-
+                    ubuntu-cache-dir ${{matrix.id}} ${{github.ref}}
+                    ubuntu-cache-dir ${{matrix.id}}
 
           - name: Setup ramdrive for testsuites
             run: |

diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -97,10 +97,10 @@ jobs:
                 path: |
                   .ccache
                   .cache/CPM
-                key: 'docker-cache-dir ${{ matrix.id }} ${{github.ref}} run-${{github.run_number}}'
+                key: 'docker-cache-dir ${{matrix.id}} ${{github.ref}}'
                 restore-keys: |
-                    docker-cache-dir ${{ matrix.id }} ${{github.ref}} run-
-                    docker-cache-dir ${{ matrix.id }}
+                    docker-cache-dir ${{matrix.id}} ${{github.ref}}
+                    docker-cache-dir ${{matrix.id}}
 
           - name: Free disk space
             run: |