Merge pull request #394 from mmuetzel/ci

CI: Keep ccache for compilation with and without OpenMP separate
DrTimothyAldenDavis · Sep 12, 2023 · 1bfde2c · 1bfde2c
2 parents f9312be + 006c81e
commit 1bfde2c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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.