From 358386ee7c60c585ed32bf62d7a7205673b7fbec Mon Sep 17 00:00:00 2001 From: Michael Tautschnig Date: Sat, 4 Feb 2023 20:51:02 +0000 Subject: [PATCH] Fix ccache restore key for check-macos-12-cmake-clang We must not pick up a cache generated by the non-Glucose job, which has the same prefix. Doing so would result in a cache that mixes different configurations, and ccache may end up pruning the wrong ones. While at it, also insert hyphens to make cache entry names easier to read. --- .github/workflows/pull-request-checks.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pull-request-checks.yaml b/.github/workflows/pull-request-checks.yaml index d99dbe476a5..d07d0dfe2c5 100644 --- a/.github/workflows/pull-request-checks.yaml +++ b/.github/workflows/pull-request-checks.yaml @@ -521,10 +521,10 @@ jobs: uses: actions/cache@v3 with: path: .ccache - key: ${{ runner.os }}-Release-Glucose${{ github.ref }}-${{ github.sha }}-PR + key: ${{ runner.os }}-Release-Glucose-${{ github.ref }}-${{ github.sha }}-PR restore-keys: | - ${{ runner.os }}-Release-Glucose${{ github.ref }} - ${{ runner.os }}-Release + ${{ runner.os }}-Release-Glucose-${{ github.ref }} + ${{ runner.os }}-Release-Glucose - name: ccache environment run: | echo "CCACHE_BASEDIR=$PWD" >> $GITHUB_ENV