From 1ba2a63e58b7401f2ffa6762645054b17a84e07b Mon Sep 17 00:00:00 2001
From: Daz DeBoer <daz@gradle.com>
Date: Sun, 29 May 2022 12:47:36 -0600
Subject: [PATCH] Fix restore-configuration-cache test workflow

The sequential jobs in the workflow emulate repeated execution of the
same Job, so they work better if given the same job id.
---
 .../integ-test-restore-configuration-cache.yml       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/integ-test-restore-configuration-cache.yml b/.github/workflows/integ-test-restore-configuration-cache.yml
index 9798195..8f722ba 100644
--- a/.github/workflows/integ-test-restore-configuration-cache.yml
+++ b/.github/workflows/integ-test-restore-configuration-cache.yml
@@ -14,7 +14,7 @@ env:
 jobs:
   seed-build-groovy:
     env:
-      GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{ inputs.cache-key-prefix }}-groovy-
+      GRADLE_BUILD_ACTION_CACHE_KEY_JOB: build-groovy
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
@@ -30,7 +30,7 @@ jobs:
 
   verify-build-groovy:
     env:
-      GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{ inputs.cache-key-prefix }}-groovy-
+      GRADLE_BUILD_ACTION_CACHE_KEY_JOB: build-groovy
     needs: seed-build-groovy
     strategy:
       matrix:
@@ -57,7 +57,7 @@ jobs:
   # Check that the build can run when no extracted cache entries are restored
   gradle-user-home-not-fully-restored:
     env:
-      GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{ inputs.cache-key-prefix }}-groovy-
+      GRADLE_BUILD_ACTION_CACHE_KEY_JOB: build-groovy
     needs: seed-build-groovy
     strategy:
       matrix:
@@ -78,7 +78,7 @@ jobs:
 
   seed-build-kotlin:
     env:
-      GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{ inputs.cache-key-prefix }}-kotlin-
+      GRADLE_BUILD_ACTION_CACHE_KEY_JOB: build-kotlin
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
@@ -94,7 +94,7 @@ jobs:
 
   modify-build-kotlin:
     env:
-      GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{ inputs.cache-key-prefix }}-kotlin-
+      GRADLE_BUILD_ACTION_CACHE_KEY_JOB: build-kotlin
     needs: seed-build-kotlin
     strategy:
       matrix:
@@ -112,7 +112,7 @@ jobs:
   # Test restore configuration-cache from the third build invocation
   verify-build-kotlin:
     env:
-      GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: ${{ inputs.cache-key-prefix }}-kotlin-
+      GRADLE_BUILD_ACTION_CACHE_KEY_JOB: build-kotlin
     needs: modify-build-kotlin
     strategy:
       matrix: