...

Author: dktapps

.github/workflows/main-php-matrix-windows.yml

@@ -31,10 +31,6 @@ jobs:
 
     concurrency: php-debug-${{ inputs.php }}-${{ inputs.runs-on }}-${{ github.ref }}
 
-    outputs:
-      cache-hit: ${{ steps.php-build-cache.outputs.cache-hit }}
-      key: ${{ steps.cache-key.outputs.key }}
-
     steps:
       - name: Set PHP build cache key
         id: cache-key
@@ -165,7 +161,7 @@ jobs:
             bin
             php-sdk
             deps
-          key: ${{ needs.build-php.outputs.key }}
+          key: php-debug-${{ inputs.php }}-${{ inputs.vs-arch }}-${{ inputs.vs-crt }}-${{ inputs.runs-on }}
 
       - name: Compile extension
         run: |

.github/workflows/main-php-matrix.yml

@@ -22,10 +22,6 @@ jobs:
 
     runs-on: ${{ inputs.runs-on }}
 
-    outputs:
-      cache-hit: ${{ steps.cache.outputs.cache-hit }}
-      key: ${{ steps.cache-key.outputs.key }}
-
     steps:
       - name: Set PHP build cache key
         id: cache-key
@@ -105,8 +101,8 @@ jobs:
       - name: Fetch PHP build cache
         uses: actions/cache/restore@v4 #fails if cache is missing
         with:
-          path: ${{ github.workspace }}/php 
-          key: ${{ needs.build-php.outputs.key }}
+          path: ${{ github.workspace }}/php
+          key: php-debug-${{ inputs.php }}-valgrind-${{ matrix.valgrind-tool != 'none' && 1 || 0 }}-${{ inputs.runs-on }}
 
       - name: Install Valgrind
         if: matrix.valgrind-tool != 'none'