From 006c81ed5291fd71fcef77feda8158dcc5d3258a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=BCtzel?= Date: Tue, 12 Sep 2023 19:09:48 +0200 Subject: [PATCH] CI: Keep ccache for compilation with and without OpenMP separate --- .github/workflows/build.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d70ad2861..54de7ca06 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -562,7 +562,7 @@ jobs: shell: msys2 {0} run: | echo "ccachedir=$(cygpath -m $(${CCACHE} -k cache_dir))" >> $GITHUB_OUTPUT - echo "key=ccache:msvc:${{ github.ref }}:$(date +"%Y-%m-%d_%H-%M-%S"):${{ github.sha }}" >> $GITHUB_OUTPUT + echo "key=ccache:msvc:${{ matrix.openmp }}:${{ github.ref }}:$(date +"%Y-%m-%d_%H-%M-%S"):${{ github.sha }}" >> $GITHUB_OUTPUT - name: restore ccache # Setup the GitHub cache used to maintain the ccache from one job to the next @@ -572,8 +572,8 @@ jobs: key: ${{ steps.ccache-prepare.outputs.key }} # Prefer caches from the same branch. Fall back to caches from the dev branch. restore-keys: | - ccache:msvc:${{ github.ref }} - ccache:msvc + ccache:msvc:${{ matrix.openmp }}:${{ github.ref }} + ccache:msvc:${{ matrix.openmp }} - name: configure ccache # Limit the maximum size and switch on compression to avoid exceeding the total disk or cache quota.