From 38785d7d621480850bb28b37e6911498d603fcd9 Mon Sep 17 00:00:00 2001
From: daz <daz@gradle.com>
Date: Wed, 20 Dec 2023 10:58:56 -0700
Subject: [PATCH] Update integ test for config-cache caching

- Rename test for clarity
- Use cache-encryption-key in config-cache test
---
 .github/workflows/ci-full-check.yml                         | 2 +-
 .github/workflows/ci-quick-check.yml                        | 2 +-
 ...ion-inputs-caching.yml => integ-test-caching-config.yml} | 6 +++---
 .../workflows/integ-test-restore-configuration-cache.yml    | 6 ++++++
 4 files changed, 11 insertions(+), 5 deletions(-)
 rename .github/workflows/{integ-test-action-inputs-caching.yml => integ-test-caching-config.yml} (97%)

diff --git a/.github/workflows/ci-full-check.yml b/.github/workflows/ci-full-check.yml
index 3fee091..6250d2a 100644
--- a/.github/workflows/ci-full-check.yml
+++ b/.github/workflows/ci-full-check.yml
@@ -25,7 +25,7 @@ jobs:
       cache-key-prefix: ${{github.run_number}}-
 
   caching-config:
-    uses: ./.github/workflows/integ-test-action-inputs-caching.yml
+    uses: ./.github/workflows/integ-test-caching-config.yml
     with:
       cache-key-prefix: ${{github.run_number}}-
 
diff --git a/.github/workflows/ci-quick-check.yml b/.github/workflows/ci-quick-check.yml
index 18ea112..87eeaf2 100644
--- a/.github/workflows/ci-quick-check.yml
+++ b/.github/workflows/ci-quick-check.yml
@@ -45,7 +45,7 @@ jobs:
 
   caching-config:
     needs: build-distribution
-    uses: ./.github/workflows/integ-test-action-inputs-caching.yml
+    uses: ./.github/workflows/integ-test-caching-config.yml
     with:
       runner-os: '["ubuntu-latest"]'
       download-dist: true
diff --git a/.github/workflows/integ-test-action-inputs-caching.yml b/.github/workflows/integ-test-caching-config.yml
similarity index 97%
rename from .github/workflows/integ-test-action-inputs-caching.yml
rename to .github/workflows/integ-test-caching-config.yml
index 13c69d1..fb398f3 100644
--- a/.github/workflows/integ-test-action-inputs-caching.yml
+++ b/.github/workflows/integ-test-caching-config.yml
@@ -1,4 +1,4 @@
-name: Test action inputs for caching
+name: Test caching configuration
 
 on:
   workflow_call:
@@ -39,7 +39,7 @@ jobs:
         # Exclude build-cache from main cache entry
         gradle-home-cache-excludes: |
             caches/build-cache-*
-            caches/*/executionHistory/**
+            caches/*/executionHistory
     - name: Build using Gradle wrapper
       working-directory: .github/workflow-samples/groovy-dsl
       run: ./gradlew test
@@ -65,7 +65,7 @@ jobs:
             enterprise
         gradle-home-cache-excludes: |
             caches/build-cache-*
-            caches/*/executionHistory/**
+            caches/*/executionHistory
         cache-read-only: true
     - name: Execute Gradle build with --offline
       working-directory: .github/workflow-samples/groovy-dsl
diff --git a/.github/workflows/integ-test-restore-configuration-cache.yml b/.github/workflows/integ-test-restore-configuration-cache.yml
index bcd5e46..e5f7061 100644
--- a/.github/workflows/integ-test-restore-configuration-cache.yml
+++ b/.github/workflows/integ-test-restore-configuration-cache.yml
@@ -34,6 +34,7 @@ jobs:
       uses: ./
       with:
         cache-read-only: false # For testing, allow writing cache entries on non-default branches
+        cache-encryption-key: Da25KUVSE5jbGds2zXmfXw==
     - name: Groovy build with configuration-cache enabled
       working-directory: .github/workflow-samples/groovy-dsl
       run: ./gradlew test --configuration-cache
@@ -55,6 +56,7 @@ jobs:
       uses: ./
       with:
         cache-read-only: true
+        cache-encryption-key: Da25KUVSE5jbGds2zXmfXw==
     - name: Groovy build with configuration-cache enabled
       id: execute
       working-directory: .github/workflow-samples/groovy-dsl
@@ -88,6 +90,7 @@ jobs:
         GRADLE_BUILD_ACTION_SKIP_RESTORE: "generated-gradle-jars|wrapper-zips|java-toolchains|instrumented-jars|dependencies|kotlin-dsl"
       with:
         cache-read-only: true
+        cache-encryption-key: Da25KUVSE5jbGds2zXmfXw==
     - name: Check execute Gradle build with configuration cache enabled (but not restored)
       working-directory: .github/workflow-samples/groovy-dsl
       run: ./gradlew test --configuration-cache
@@ -108,6 +111,7 @@ jobs:
       uses: ./
       with:
         cache-read-only: false # For testing, allow writing cache entries on non-default branches
+        cache-encryption-key: Da25KUVSE5jbGds2zXmfXw==
     - name: Execute 'help' with configuration-cache enabled
       working-directory: .github/workflow-samples/kotlin-dsl
       run: ./gradlew help --configuration-cache
@@ -129,6 +133,7 @@ jobs:
       uses: ./
       with:
         cache-read-only: false # For testing, allow writing cache entries on non-default branches
+        cache-encryption-key: Da25KUVSE5jbGds2zXmfXw==
     - name: Execute 'test' with configuration-cache enabled
       working-directory: .github/workflow-samples/kotlin-dsl
       run: ./gradlew test --configuration-cache
@@ -151,6 +156,7 @@ jobs:
       uses: ./
       with:
         cache-read-only: true
+        cache-encryption-key: Da25KUVSE5jbGds2zXmfXw==
     - name: Execute 'test' again with configuration-cache enabled
       id: execute
       working-directory: .github/workflow-samples/kotlin-dsl