changeset 30614:43ca3f7d6359 stable

GitHub-CI: Don't restore ccache from different "main" branch. * .github/workflows/make.yaml: When branching, e.g. in a fork, use the ccache from the correct "parent" branch if available.
author Markus Mützel <markus.muetzel@gmx.de>
date Sat, 08 Jan 2022 12:55:17 +0100
parents cfade47fc4fc
children 56fdd2655765 9c7561dda313
files .github/workflows/make.yaml
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.github/workflows/make.yaml	Sat Jan 08 12:13:28 2022 +0100
+++ b/.github/workflows/make.yaml	Sat Jan 08 12:55:17 2022 +0100
@@ -76,7 +76,7 @@
           key: ccache:${{ matrix.os }}:${{ matrix.compiler }}:${{ github.ref }}:${{ steps.ccache_cache_timestamp.outputs.timestamp }}:${{ github.sha }}
           restore-keys: |
             ccache:${{ matrix.os }}:${{ matrix.compiler }}:${{ github.ref }}
-            ccache:${{ matrix.os }}:${{ matrix.compiler }}
+            ccache:${{ matrix.os }}:${{ matrix.compiler }}:refs/heads/stable
 
       - name: configure ccache
         env:
@@ -215,7 +215,7 @@
           key: ccache:${{ matrix.os }}:${{ matrix.compiler }}:${{ github.ref }}:${{ steps.ccache_cache_timestamp.outputs.timestamp }}:${{ github.sha }}
           restore-keys: |
             ccache:${{ matrix.os }}:${{ matrix.compiler }}:${{ github.ref }}
-            ccache:${{ matrix.os }}:${{ matrix.compiler }}
+            ccache:${{ matrix.os }}:${{ matrix.compiler }}:refs/heads/stable
 
       - name: configure ccache
         # The cache doesn't seem to compress well on macOS. Is it already compressed?
@@ -420,7 +420,7 @@
           key: ccache:${{ matrix.os }}:${{ matrix.compiler }}:${{ matrix.target }}:${{ github.ref }}:${{ steps.ccache_cache_timestamp.outputs.timestamp }}:${{ github.sha }}
           restore-keys: |
             ccache:${{ matrix.os }}:${{ matrix.compiler }}:${{ matrix.target }}:${{ github.ref }}
-            ccache:${{ matrix.os }}:${{ matrix.compiler }}:${{ matrix.target }}
+            ccache:${{ matrix.os }}:${{ matrix.compiler }}:${{ matrix.target }}:refs/heads/stable
 
       - name: configure ccache
         # Limit the maximum size and switch on compression to avoid exceeding the total disk or cache quota.