From 1390ca645401b78672329bfa72ed1907faeee1b9 Mon Sep 17 00:00:00 2001
From: daz <daz@gradle.com>
Date: Sat, 6 Apr 2024 13:50:39 -0600
Subject: [PATCH] Don't rely on preinstalled gradle for test

---
 .github/workflows/integ-test-caching-config.yml      | 12 ++++++------
 .../workflows/integ-test-detect-java-toolchains.yml  |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/integ-test-caching-config.yml b/.github/workflows/integ-test-caching-config.yml
index ed53c0f6..7486d171 100644
--- a/.github/workflows/integ-test-caching-config.yml
+++ b/.github/workflows/integ-test-caching-config.yml
@@ -88,10 +88,10 @@ jobs:
       uses: ./setup-gradle
       with:
         cache-disabled: true
-    - name: Run Gradle build
+    - name: Build using Gradle wrapper
       id: gradle
-      working-directory: .github/workflow-samples/no-wrapper${{ matrix.build-root-suffix }}
-      run: gradle help "-DgradleVersionCheck=${{matrix.gradle}}"
+      working-directory: .github/workflow-samples/groovy-dsl
+      run: ./gradlew help
     - name: Check Build Scan url is captured
       if: ${{ !steps.gradle.outputs.build-scan-url }}
       uses: actions/github-script@v7
@@ -112,10 +112,10 @@ jobs:
       run: mkdir -p ~/.gradle/caches
     - name: Setup Gradle
       uses: ./setup-gradle
-    - name: Run Gradle build
+    - name: Build using Gradle wrapper
       id: gradle
-      working-directory: .github/workflow-samples/no-wrapper${{ matrix.build-root-suffix }}
-      run: gradle help "-DgradleVersionCheck=${{matrix.gradle}}"
+      working-directory: .github/workflow-samples/groovy-dsl
+      run: ./gradlew help
     - name: Check Build Scan url is captured
       if: ${{ !steps.gradle.outputs.build-scan-url }}
       uses: actions/github-script@v7
diff --git a/.github/workflows/integ-test-detect-java-toolchains.yml b/.github/workflows/integ-test-detect-java-toolchains.yml
index 1242b540..d08ba8b1 100644
--- a/.github/workflows/integ-test-detect-java-toolchains.yml
+++ b/.github/workflows/integ-test-detect-java-toolchains.yml
@@ -36,7 +36,7 @@ jobs:
       shell: bash
       working-directory: .github/workflow-samples/groovy-dsl
       run: | 
-        gradle --info javaToolchains > output.txt
+        ./gradlew --info javaToolchains > output.txt
         cat output.txt
     - name: Verify detected toolchains
       shell: bash
@@ -76,7 +76,7 @@ jobs:
       shell: bash
       working-directory: .github/workflow-samples/groovy-dsl
       run: | 
-        gradle --info javaToolchains > output.txt
+        ./gradlew --info javaToolchains > output.txt
         cat output.txt
     - name: Verify setup JDKs are detected
       shell: bash