Use separaet cache keys for each workflow

DavidAce · Jun 2, 2023 · ab67985 · ab67985
1 parent 3a4d52f
commit ab67985
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 10 deletions.
diff --git a/.github/workflows/macos11.yml b/.github/workflows/macos11.yml
@@ -38,7 +38,7 @@ jobs:
             ~/.ccache
             ~/.conan2
             install/github-actions-${{ matrix.manager }}
-          key: ${{ runner.os }}-${{ env.cache-name }}
+          key: ${{ github.workflow }}-${{ env.cache-name }}
 
       - name: Setup build tools
         run: |

diff --git a/.github/workflows/macos12.yml b/.github/workflows/macos12.yml
@@ -38,7 +38,7 @@ jobs:
             ~/.ccache
             ~/.conan2
             install/github-actions-${{ matrix.manager }}
-          key: ${{ runner.os }}-${{ env.cache-name }}
+          key: ${{ github.workflow }}-${{ env.cache-name }}
 
       - name: Setup build tools
         run: |

diff --git a/.github/workflows/ubuntu20.yml b/.github/workflows/ubuntu20.yml
@@ -31,7 +31,6 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: '3.x'
-          cache: 'pip'
 
       - name: Update apt
         run: |
@@ -45,7 +44,7 @@ jobs:
             ~/.ccache
             ~/.conan2
             install/github-actions-${{ matrix.manager }}
-          key: ${{ runner.os }}-${{ env.cache-name }}
+          key: ${{ github.workflow }}-${{ env.cache-name }}
 
       - name: Setup gcc
         if: matrix.compiler == 'gcc'

diff --git a/.github/workflows/ubuntu22.yml b/.github/workflows/ubuntu22.yml
@@ -46,7 +46,7 @@ jobs:
             ~/.ccache
             ~/.conan2
             install/github-actions-${{ matrix.manager }}
-          key: ${{ runner.os }}-${{ env.cache-name }}
+          key: ${{ github.workflow }}-${{ env.cache-name }}
 
       - name: Setup gcc
         if: matrix.compiler == 'gcc'

diff --git a/.github/workflows/windows2019.yml b/.github/workflows/windows2019.yml
@@ -25,7 +25,7 @@ jobs:
       - uses: lukka/get-cmake@latest
       - name: Setup Python
         uses: actions/setup-python@v4
-        if: contains(matrix.manager, 'conan')
+        if: matrix.manager == 'conan'
         with:
           python-version: '3.x'
 
@@ -36,7 +36,7 @@ jobs:
           path: |
             ~/.conan2
             install/github-actions-${{ matrix.manager }}
-          key: ${{ runner.os }}-${{ env.cache-name }}
+          key: ${{ github.workflow }}-${{ env.cache-name }}
 
       - name: Setup conan
         if: matrix.manager == 'conan'
@@ -51,4 +51,4 @@ jobs:
           configurePresetAdditionalArgs: "['-DH5PP_ENABLE_ASAN=FALSE']"
           buildPreset: 'github-actions-${{ matrix.manager }}'
           testPreset: 'github-actions-${{ matrix.manager }}'
-          testPresetAdditionalArgs: "['--config Debug']"
+          testPresetAdditionalArgs: "['--build-config=Debug']"
diff --git a/.github/workflows/windows2022.yml b/.github/workflows/windows2022.yml
@@ -36,7 +36,7 @@ jobs:
           path: |
             ~/.conan2
             install/github-actions-${{ matrix.manager }}
-          key: ${{ runner.os }}-${{ env.cache-name }}
+          key: ${{ github.workflow }}-${{ env.cache-name }}
 
       - name: Setup conan
         if: matrix.manager == 'conan'
@@ -51,4 +51,4 @@ jobs:
           configurePresetAdditionalArgs: "['-DH5PP_ENABLE_ASAN=FALSE']"
           buildPreset: 'github-actions-${{ matrix.manager }}'
           testPreset: 'github-actions-${{ matrix.manager }}'
-          testPresetAdditionalArgs: "['--config Debug']"
+          testPresetAdditionalArgs: "['--build-config=Debug']"