From c13dc6c7896360d74c135b56fb50529cc7023da4 Mon Sep 17 00:00:00 2001
From: Daz DeBoer <daz@gradle.com>
Date: Sun, 29 May 2022 15:13:03 -0600
Subject: [PATCH] Fix and re-enable test for save/restore config-cache

---
 .github/workflows/ci-quick-check.yml                 | 12 ++++++------
 .../integ-test-restore-configuration-cache.yml       | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci-quick-check.yml b/.github/workflows/ci-quick-check.yml
index 95bfa45..8cd560b 100644
--- a/.github/workflows/ci-quick-check.yml
+++ b/.github/workflows/ci-quick-check.yml
@@ -48,12 +48,12 @@ jobs:
       runner-os: '["ubuntu-latest"]'
       download-dist: true
 
-  # restore-configuration-cache:
-  #   needs: build-distribution
-  #   uses: ./.github/workflows/integ-test-restore-configuration-cache.yml
-  #   with:
-  #     runner-os: '["ubuntu-latest"]'
-  #     download-dist: true
+  restore-configuration-cache:
+    needs: build-distribution
+    uses: ./.github/workflows/integ-test-restore-configuration-cache.yml
+    with:
+      runner-os: '["ubuntu-latest"]'
+      download-dist: true
 
   restore-custom-gradle-home:
     needs: build-distribution
diff --git a/.github/workflows/integ-test-restore-configuration-cache.yml b/.github/workflows/integ-test-restore-configuration-cache.yml
index 445fdb0..28d19c3 100644
--- a/.github/workflows/integ-test-restore-configuration-cache.yml
+++ b/.github/workflows/integ-test-restore-configuration-cache.yml
@@ -20,7 +20,7 @@ env:
 jobs:
   seed-build-groovy:
     env:
-      GRADLE_BUILD_ACTION_CACHE_KEY_JOB: build-groovy
+      GRADLE_BUILD_ACTION_CACHE_KEY_JOB: restore-cc-groovy
     strategy:
       matrix:
         os: ${{fromJSON(inputs.runner-os)}}
@@ -38,7 +38,7 @@ jobs:
 
   verify-build-groovy:
     env:
-      GRADLE_BUILD_ACTION_CACHE_KEY_JOB: build-groovy
+      GRADLE_BUILD_ACTION_CACHE_KEY_JOB: restore-cc-groovy
     needs: seed-build-groovy
     strategy:
       matrix:
@@ -67,7 +67,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_JOB: build-groovy
+      GRADLE_BUILD_ACTION_CACHE_KEY_JOB: restore-cc-groovy
     needs: seed-build-groovy
     strategy:
       matrix:
@@ -90,7 +90,7 @@ jobs:
 
   seed-build-kotlin:
     env:
-      GRADLE_BUILD_ACTION_CACHE_KEY_JOB: build-kotlin
+      GRADLE_BUILD_ACTION_CACHE_KEY_JOB: restore-cc-kotlin
     strategy:
       matrix:
         os: ${{fromJSON(inputs.runner-os)}}
@@ -108,7 +108,7 @@ jobs:
 
   modify-build-kotlin:
     env:
-      GRADLE_BUILD_ACTION_CACHE_KEY_JOB: build-kotlin
+      GRADLE_BUILD_ACTION_CACHE_KEY_JOB: restore-cc-kotlin-modified
     needs: seed-build-kotlin
     strategy:
       matrix:
@@ -128,7 +128,7 @@ jobs:
   # Test restore configuration-cache from the third build invocation
   verify-build-kotlin:
     env:
-      GRADLE_BUILD_ACTION_CACHE_KEY_JOB: build-kotlin
+      GRADLE_BUILD_ACTION_CACHE_KEY_JOB: restore-cc-kotlin-modified
     needs: modify-build-kotlin
     strategy:
       matrix: