From c01af7a6f61576758e86ff240e46ea14be804e5f Mon Sep 17 00:00:00 2001
From: Daz DeBoer <daz@gradle.com>
Date: Thu, 26 Aug 2021 17:55:19 -0600
Subject: [PATCH] Test coverage: verify correct Gradle version is being used

---
 .github/workflows/prod.yml                   | 19 +++++++++++++++----
 __tests__/samples/no-wrapper/settings.gradle |  7 ++++++-
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/prod.yml b/.github/workflows/prod.yml
index 235a88c..e8f5b72 100644
--- a/.github/workflows/prod.yml
+++ b/.github/workflows/prod.yml
@@ -1,4 +1,4 @@
- # make sure the action works on a clean machine without building
+ # Make sure the action works on a clean machine without building
 name: prod
 
 on:
@@ -10,6 +10,8 @@ env:
   CACHE_KEY_SEED: ${{github.workflow}}#${{github.run_number}}-
 
 jobs:
+  # Run initial Gradle builds to push initial cache entries
+  # These builds should start fresh without cache hits, due to the seed injected into the cache key above.
   basic-build:
     strategy:
       matrix:
@@ -29,6 +31,9 @@ jobs:
         build-root-directory: __tests__/samples/basic
         arguments: test --configuration-cache
    
+  # Tests for executing with different Gradle versions. 
+  # Each build verifies that it is executed with the expected Gradle version.
+  # These builds will not store cache entries for gradle-user-home or project-dot-gradle
   gradle-execution:
     needs: basic-build
     strategy:
@@ -46,19 +51,25 @@ jobs:
       with:
         gradle-version: 6.9
         build-root-directory: __tests__/samples/no-wrapper
-        arguments: help
+        arguments: help -DgradleVersionCheck=6.9
+        gradle-user-home-cache-enabled: read-only
+        project-dot-gradle-cache-enabled: read-only
     - name: Test use Gradle version alias
       uses: ./
       with:
         gradle-version: release-candidate
         build-root-directory: __tests__/samples/no-wrapper
-        arguments: help
+        arguments: help -DgradleVersionCheck=7.2
+        gradle-user-home-cache-enabled: read-only
+        project-dot-gradle-cache-enabled: read-only
     - name: Test use defined Gradle executable
       uses: ./
       with:
         gradle-executable: __tests__/samples/basic/gradlew${{ matrix.script-suffix }}
         build-root-directory: __tests__/samples/no-wrapper
-        arguments: help
+        arguments: help -DgradleVersionCheck=7.1.1
+        gradle-user-home-cache-enabled: read-only
+        project-dot-gradle-cache-enabled: read-only
 
   dependencies-cache:
     needs: basic-build
diff --git a/__tests__/samples/no-wrapper/settings.gradle b/__tests__/samples/no-wrapper/settings.gradle
index e18a8cf..c197f1a 100644
--- a/__tests__/samples/no-wrapper/settings.gradle
+++ b/__tests__/samples/no-wrapper/settings.gradle
@@ -1,3 +1,8 @@
 rootProject.name = 'no-wrapper'
 
-println "Using Gradle version: ${gradle.gradleVersion}"
\ No newline at end of file
+println "Using Gradle version: ${gradle.gradleVersion}"
+
+def gradleVersionCheck = System.properties.gradleVersionCheck
+if (gradleVersionCheck && gradle.gradleVersion != gradleVersionCheck) {
+    throw new RuntimeException("Got the wrong version: expected ${gradleVersionCheck} but was ${gradle.gradleVersion}")
+}
\ No newline at end of file