Build outputs

Fixes #369

.github/workflow-samples/gradle-plugin/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=29e49b10984e585d8118b7d0bc452f944e386458df27371b49b4ac1dec4b7fda
+distributionSha256Sum=f6b8596b10cce501591e92f229816aa4046424f3b24d771751b06779d58c8ec4
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

.github/workflow-samples/gradle-plugin/gradlew

@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

.github/workflow-samples/gradle-plugin/gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+set EXIT_CODE=%ERRORLEVEL%
-exit /b 1
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

.github/workflow-samples/groovy-dsl/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=29e49b10984e585d8118b7d0bc452f944e386458df27371b49b4ac1dec4b7fda
+distributionSha256Sum=f6b8596b10cce501591e92f229816aa4046424f3b24d771751b06779d58c8ec4
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

.github/workflow-samples/groovy-dsl/gradlew

@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

.github/workflow-samples/groovy-dsl/gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+set EXIT_CODE=%ERRORLEVEL%
-exit /b 1
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

.github/workflow-samples/groovy-dsl/settings.gradle

@@ -1,6 +1,6 @@
 plugins {
-    id "com.gradle.enterprise" version "3.10.2"
+    id "com.gradle.enterprise" version "3.11.1"
-    id "com.gradle.common-custom-user-data-gradle-plugin" version "1.7.2"
+    id "com.gradle.common-custom-user-data-gradle-plugin" version "1.8.0"
 }
 
 gradleEnterprise {

.github/workflow-samples/java-toolchain/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=29e49b10984e585d8118b7d0bc452f944e386458df27371b49b4ac1dec4b7fda
+distributionSha256Sum=f6b8596b10cce501591e92f229816aa4046424f3b24d771751b06779d58c8ec4
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

.github/workflow-samples/java-toolchain/gradlew

@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

.github/workflow-samples/java-toolchain/gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+set EXIT_CODE=%ERRORLEVEL%
-exit /b 1
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

.github/workflow-samples/kotlin-dsl/build.gradle.kts

@@ -10,7 +10,7 @@ dependencies {
     api("org.apache.commons:commons-math3:3.6.1")
     implementation("com.google.guava:guava:31.1-jre")
 
-    testImplementation("org.junit.jupiter:junit-jupiter:5.8.2")
+    testImplementation("org.junit.jupiter:junit-jupiter:5.9.0")
 }
 
 tasks.test {

.github/workflow-samples/kotlin-dsl/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=29e49b10984e585d8118b7d0bc452f944e386458df27371b49b4ac1dec4b7fda
+distributionSha256Sum=f6b8596b10cce501591e92f229816aa4046424f3b24d771751b06779d58c8ec4
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

.github/workflow-samples/kotlin-dsl/gradlew

@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

.github/workflow-samples/kotlin-dsl/gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+set EXIT_CODE=%ERRORLEVEL%
-exit /b 1
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

.github/workflow-samples/kotlin-dsl/settings.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
-    id("com.gradle.enterprise") version "3.10.2"
+    id("com.gradle.enterprise") version "3.11.1"
-    id("com.gradle.common-custom-user-data-gradle-plugin") version "1.7.2"
+    id("com.gradle.common-custom-user-data-gradle-plugin") version "1.8.0"
 }
 
 gradleEnterprise {

.github/workflow-samples/no-wrapper-gradle-5/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "com.gradle.build-scan" version "3.10.2" 
+    id "com.gradle.build-scan" version "3.11.1" 
 }
 
 gradleEnterprise {

.github/workflow-samples/no-wrapper/settings.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "com.gradle.enterprise" version "3.10.2"
+    id "com.gradle.enterprise" version "3.11.1"
 }
 
 gradleEnterprise {

.github/workflows/ci-verify-outputs.yml

@@ -8,6 +8,7 @@ on:
   push:
     branches: 
       - main
+      - dependabot/**
 
 jobs:
   check:

.github/workflows/integ-test-execution.yml

@@ -51,12 +51,12 @@ jobs:
       with:
         gradle-executable: .github/workflow-samples/groovy-dsl/gradlew${{ matrix.script-suffix }}
         build-root-directory: .github/workflow-samples/no-wrapper
-        arguments: help -DgradleVersionCheck=7.4.2
+        arguments: help
 
   gradle-versions:
     strategy:
       matrix:
-        gradle: [7.3, 6.9, 5.6.4, 4.10.3, 3.5.1]
+        gradle: [7.5.1, 6.9.2, 5.6.4, 4.10.3, 3.5.1]
         os: ${{fromJSON(inputs.runner-os)}}
         include:
           - gradle: 5.6.4

README.md

@@ -205,7 +205,6 @@ Caching is enabled by default. You can disable caching for the action as follows
 ```yaml
 cache-disabled: true
 ```
-
 ### Cache keys
 
 Distributions downloaded to satisfy a `gradle-version` parameter are stored outside of Gradle User Home and cached separately. The cache key is unique to the downloaded distribution and will not change over time.
@@ -234,6 +233,13 @@ You can configure read-only caching for the `gradle-build-action` as follows:
 cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/release' }}
 ```
 
+### Stopping the Gradle daemon
+
+By default, the action will stop all running Gradle daemons in the post-action step, prior to saving the Gradle User Home state. 
+This allows for any Gradle User Home cleanup to occur, and avoid file-locking issues on Windows.
+
+If caching is unavailable or the cache is in read-only mode, the daemon will not be stopped and will continue running after the job is completed.
+
 ### Gradle User Home cache tuning
 
 As well as any wrapper distributions, the action will attempt to save and restore the `caches` and `notifications` directories from Gradle User Home.
@@ -258,7 +264,7 @@ File pattern support is documented at https://docs.github.com/en/actions/learn-g
 
 Gradle User Home state will be restored from the cache during the first `gradle-build-action` step for any workflow job. 
 This state will be saved back to the cache at the end of the job, after all Gradle executions have completed.
-A report of all cache entries restored and saved is printed to the action log when saving the cache entries. 
+A report of all cache entries restored and saved is printed to the Job Summary when saving the cache entries. 
 This report can provide valuable insignt into how much cache space is being used.
 
 It is possible to enable additional debug logging for cache operations. You do via the `GRADLE_BUILD_ACTION_CACHE_DEBUG_ENABLED` environment variable:
@@ -272,17 +278,18 @@ Note that this setting will also prevent certain cache operations from running i
 
 ### Optimizing cache effectiveness
 
-Cache storage space for GitHub actions is limited, and writing new cache entries can trigger the deletion of exising entries.
+Cache storage space for GitHub actions is limited, and writing new cache entries can trigger the deletion of existing entries.
 Eviction of shared cache entries can reduce cache effectiveness, slowing down your `gradle-build-action` steps.
 
 There are a number of actions you can take if your cache use is less effective due to entry eviction.
 
 #### Select branches that should write to the cache
 
-GitHub cache entries are not shared between builds on different branches. This means that identical cache entries will be stored separately for different branches.
+GitHub cache entries are not shared between builds on different branches. 
-An exception to this is that cache entries for the default (`master`/`main`) branch can be read by actions invoked for other branches.
+This means that each PR branch will have it's own Gradle User Home cache, and will not benefit from cache entries written by other PR branches.
+An exception to this is that cache entries written in parent and upstream branches are visible to child branches, and cache entries for the default (`master`/`main`) branch can be read by actions invoked for any other branch.
 
-By default, the `gradle-build-action` will only _write_ to the cache for builds run on the default branch. 
+By default, the `gradle-build-action` will only _write_ to the cache for builds run on the default (`master`/`main`) branch. 
 Jobs run on other branches will only read from the cache. In most cases, this is the desired behaviour, 
 because Jobs run against other branches will benefit from the cache Gradle User Home from `main`, 
 without writing private cache entries that could lead to evicting shared entries.
@@ -361,3 +368,11 @@ jobs:
             body: '❌ ${{ github.workflow }} failed: ${{ steps.gradle.outputs.build-scan-url }}'
           })
 ```
+
+## Support for GitHub Enterprise Server (GHES)
+
+You can use the `gradle-build-action` on GitHub Enterprise Server, and benefit from the improved integration with Gradle. Depending on the version of GHES you are running, certain features may be limited:
+- Build scan links are captured and displayed in the GitHub Actions UI
+- Easily run your build with different versions of Gradle
+- Save/restore of Gradle User Home (requires GHES v3.5+ : GitHub Actions cache was introduced in GHES 3.5)
+- Support for GitHub Actions Job Summary is not yet available in any version of GHES. Instead of producing a Job Summary, the build-results summary and caching report will be written to the workflow log, as part of the post-action step.

action.yml

@@ -18,7 +18,7 @@ inputs:
       When 'true', existing entries will be read from the cache but no entries will be written.
       By default this value is 'false' for workflows on the GitHub default branch and 'true' for workflows on other branches.
     required: false
-    default: ${{ github.ref_name != github.event.repository.default_branch }}
+    default: ${{ github.event.repository && github.ref_name != github.event.repository.default_branch }}
 
   cache-write-only:
     description: |
@@ -66,6 +66,10 @@ inputs:
     description: When 'true', the action will not attempt to restore the Gradle User Home entries from other Jobs.
     required: false
     default: false
+  cache-read-timeout:
+    description: A timeout value in seconds for cache reads. Requests taking longer that this will be aborted.
+    required: true
+    default: 600
   workflow-job-context:
     description: Used to uniquely identify the current job invocation. Defaults to the matrix values for this job; this should not be overridden by users (INTERNAL).
     required: false

package.json

@@ -25,8 +25,8 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@actions/cache": "2.0.6",
+    "@actions/cache": "3.0.3",
-    "@actions/core": "1.8.2",
+    "@actions/core": "1.9.1",
     "@actions/exec": "1.1.1",
     "@actions/github": "5.0.3",
     "@actions/glob": "0.3.0",
@@ -35,19 +35,19 @@
     "string-argv": "0.3.1"
   },
   "devDependencies": {
-    "@types/jest": "28.1.1",
+    "@types/jest": "28.1.7",
     "@types/node": "16.11.21",
     "@types/unzipper": "0.10.5",
-    "@typescript-eslint/parser": "5.28.0",
+    "@typescript-eslint/parser": "5.33.1",
     "@vercel/ncc": "0.34.0",
-    "eslint": "8.17.0",
+    "eslint": "8.22.0",
-    "eslint-plugin-github": "4.3.6",
+    "eslint-plugin-github": "4.3.7",
-    "eslint-plugin-jest": "26.5.3",
+    "eslint-plugin-jest": "26.8.3",
-    "jest": "28.1.1",
+    "jest": "28.1.3",
     "js-yaml": "4.1.0",
     "patch-package": "6.4.7",
-    "prettier": "2.7.0",
+    "prettier": "2.7.1",
-    "ts-jest": "28.0.5",
+    "ts-jest": "28.0.8",
-    "typescript": "4.7.3"
+    "typescript": "4.7.4"
   }
 }

patches/@actions+cache+3.0.3.patch

@@ -26,18 +26,17 @@ index 16b20f7..aea77ba 100644
 +    constructor(key: string, size?: number);
 +}
 diff --git a/node_modules/@actions/cache/lib/cache.js b/node_modules/@actions/cache/lib/cache.js
-index 2dd645a..a392352 100644
+index 4dc5e88..92d99d5 100644
 --- a/node_modules/@actions/cache/lib/cache.js
 +++ b/node_modules/@actions/cache/lib/cache.js
-@@ -93,6 +93,7 @@ function restoreCache(paths, primaryKey, restoreKeys, options) {
+@@ -95,26 +95,18 @@ function restoreCache(paths, primaryKey, restoreKeys, options) {
              }
-         const archivePath = path.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod));
+             archivePath = path.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod));
              core.debug(`Archive Path: ${archivePath}`);
 +            const restoredEntry = new CacheEntry(cacheEntry.cacheKey);
-         try {
              // Download the cache from the cache entry
              yield cacheHttpClient.downloadCache(cacheEntry.archiveLocation, archivePath, options);
-@@ -100,6 +101,7 @@ function restoreCache(paths, primaryKey, restoreKeys, options) {
+             if (core.isDebug()) {
                  yield tar_1.listTar(archivePath, compressionMethod);
              }
              const archiveFileSize = utils.getArchiveFileSizeInBytes(archivePath);
@@ -45,16 +44,22 @@ index 2dd645a..a392352 100644
              core.info(`Cache Size: ~${Math.round(archiveFileSize / (1024 * 1024))} MB (${archiveFileSize} B)`);
              yield tar_1.extractTar(archivePath, compressionMethod);
              core.info('Cache restored successfully');
-@@ -113,7 +115,7 @@ function restoreCache(paths, primaryKey, restoreKeys, options) {
-                 core.debug(`Failed to delete archive: ${error}`);
-             }
-         }
 -            return cacheEntry.cacheKey;
+-        }
+-        catch (error) {
+-            const typedError = error;
+-            if (typedError.name === ValidationError.name) {
+-                throw error;
+-            }
+-            else {
+-                // Supress all non-validation cache related errors because caching should be optional
+-                core.warning(`Failed to restore: ${error.message}`);
+-            }
 +            return restoredEntry;
-     });
          }
- exports.restoreCache = restoreCache;
+         finally {
-@@ -141,6 +143,7 @@ function saveCache(paths, key, options) {
+             // Try to delete the archive to save space
+@@ -153,6 +145,7 @@ function saveCache(paths, key, options) {
          const archiveFolder = yield utils.createTempDirectory();
          const archivePath = path.join(archiveFolder, utils.getCacheFileName(compressionMethod));
          core.debug(`Archive Path: ${archivePath}`);
@@ -62,7 +67,7 @@ index 2dd645a..a392352 100644
          try {
              yield tar_1.createTar(archiveFolder, cachePaths, compressionMethod);
              if (core.isDebug()) {
-@@ -148,6 +151,7 @@ function saveCache(paths, key, options) {
+@@ -160,6 +153,7 @@ function saveCache(paths, key, options) {
              }
              const fileSizeLimit = 10 * 1024 * 1024 * 1024; // 10GB per repo limit
              const archiveFileSize = utils.getArchiveFileSizeInBytes(archivePath);
@@ -70,7 +75,26 @@ index 2dd645a..a392352 100644
              core.debug(`File Size: ${archiveFileSize}`);
              // For GHES, this check will take place in ReserveCache API with enterprise file size limit
              if (archiveFileSize > fileSizeLimit && !utils.isGhes()) {
-@@ -179,8 +183,15 @@ function saveCache(paths, key, options) {
+@@ -182,18 +176,6 @@ function saveCache(paths, key, options) {
+             core.debug(`Saving Cache (ID: ${cacheId})`);
+             yield cacheHttpClient.saveCache(cacheId, archivePath, options);
+         }
+-        catch (error) {
+-            const typedError = error;
+-            if (typedError.name === ValidationError.name) {
+-                throw error;
+-            }
+-            else if (typedError.name === ReserveCacheError.name) {
+-                core.info(`Failed to save: ${typedError.message}`);
+-            }
+-            else {
+-                core.warning(`Failed to save: ${typedError.message}`);
+-            }
+-        }
+         finally {
+             // Try to delete the archive to save space
+             try {
+@@ -203,8 +185,15 @@ function saveCache(paths, key, options) {
                  core.debug(`Failed to delete archive: ${error}`);
              }
          }

release/changes.md

@@ -1 +0,0 @@
-- [NEW] Use Job Summary to display build scan links, instead of GHA annotations

src/build-results.ts

@@ -0,0 +1,27 @@
+import * as fs from 'fs'
+import * as path from 'path'
+
+export interface BuildResult {
+    get rootProjectName(): string
+    get rootProjectDir(): string
+    get requestedTasks(): string
+    get gradleVersion(): string
+    get gradleHomeDir(): string
+    get buildFailed(): boolean
+    get buildScanUri(): string
+    get buildScanFailed(): boolean
+}
+
+export function loadBuildResults(): BuildResult[] {
+    const buildResultsDir = path.resolve(process.env['RUNNER_TEMP']!, '.build-results')
+    if (!fs.existsSync(buildResultsDir)) {
+        return []
+    }
+
+    return fs.readdirSync(buildResultsDir).map(file => {
+        // Every file in the .build-results dir should be a BuildResults JSON
+        const filePath = path.join(buildResultsDir, file)
+        const content = fs.readFileSync(filePath, 'utf8')
+        return JSON.parse(content) as BuildResult
+    })
+}

src/cache-base.ts

@@ -101,9 +101,9 @@ export class GradleStateCache {
 
             for (const entryListener of listener.cacheEntries) {
                 if (entryListener === gradleHomeEntryListener) {
-                    entryListener.markUnsaved('cache key not changed')
+                    entryListener.markNotSaved('cache key not changed')
                 } else {
-                    entryListener.markUnsaved(`referencing '${this.cacheDescription}' cache entry not saved`)
+                    entryListener.markNotSaved(`referencing '${this.cacheDescription}' cache entry not saved`)
                 }
             }
             return

src/cache-extract-entries.ts

@@ -14,7 +14,7 @@ import {
     saveCache,
     tryDelete
 } from './cache-utils'
-import {loadBuildResults} from './job-summary'
+import {loadBuildResults} from './build-results'
 
 const SKIP_RESTORE_VAR = 'GRADLE_BUILD_ACTION_SKIP_RESTORE'
 
@@ -213,7 +213,7 @@ abstract class AbstractEntryExtractor {
 
         if (previouslyRestoredKey === cacheKey) {
             cacheDebug(`No change to previously restored ${artifactType}. Not saving.`)
-            entryListener.markUnsaved('contents unchanged')
+            entryListener.markNotSaved('contents unchanged')
         } else {
             core.info(`Caching ${artifactType} with path '${pattern}' and cache key: ${cacheKey}`)
             await saveCache([pattern], cacheKey, entryListener)

src/cache-reporting.ts

@@ -1,4 +1,5 @@
 import * as core from '@actions/core'
+import * as cache from '@actions/cache'
 
 /**
  * Collects information on what entries were saved and restored during the action.
@@ -6,18 +7,19 @@ import * as core from '@actions/core'
  */
 export class CacheListener {
     cacheEntries: CacheEntryListener[] = []
-    isCacheReadOnly = false
+    cacheReadOnly = false
-    isCacheWriteOnly = false
+    cacheWriteOnly = false
-    isCacheDisabled = false
+    cacheDisabled = false
 
     get fullyRestored(): boolean {
         return this.cacheEntries.every(x => !x.wasRequestedButNotRestored())
     }
 
     get cacheStatus(): string {
-        if (this.isCacheDisabled) return 'disabled'
+        if (!cache.isFeatureAvailable()) return 'not available'
-        if (this.isCacheWriteOnly) return 'write-only'
+        if (this.cacheDisabled) return 'disabled'
-        if (this.isCacheReadOnly) return 'read-only'
+        if (this.cacheWriteOnly) return 'write-only'
+        if (this.cacheReadOnly) return 'read-only'
         return 'enabled'
     }
 
@@ -60,11 +62,11 @@ export class CacheEntryListener {
     requestedRestoreKeys: string[] | undefined
     restoredKey: string | undefined
     restoredSize: number | undefined
+    notRestored: string | undefined
 
     savedKey: string | undefined
     savedSize: number | undefined
-
+    notSaved: string | undefined
-    unsaved: string | undefined
 
     constructor(entryName: string) {
         this.entryName = entryName
@@ -86,6 +88,11 @@ export class CacheEntryListener {
         return this
     }
 
+    markNotRestored(message: string): CacheEntryListener {
+        this.notRestored = message
+        return this
+    }
+
     markSaved(key: string, size: number | undefined): CacheEntryListener {
         this.savedKey = key
         this.savedSize = size
@@ -98,13 +105,13 @@ export class CacheEntryListener {
         return this
     }
 
-    markUnsaved(message: string): CacheEntryListener {
+    markNotSaved(message: string): CacheEntryListener {
-        this.unsaved = message
+        this.notSaved = message
         return this
     }
 }
 
-export function logCachingReport(listener: CacheListener): void {
+export function writeCachingReport(listener: CacheListener): void {
     const entries = listener.cacheEntries
 
     core.summary.addRaw(
@@ -123,21 +130,7 @@ export function logCachingReport(listener: CacheListener): void {
 
     core.summary.addHeading('Cache Entry Details', 5)
 
-    const entryDetails = listener.cacheEntries
+    const entryDetails = renderEntryDetails(listener)
-        .map(
-            entry =>
-                `Entry: ${entry.entryName}
-    Requested Key : ${entry.requestedKey ?? ''}
-    Restored  Key : ${entry.restoredKey ?? ''}
-              Size: ${formatSize(entry.restoredSize)}
-              ${getRestoredMessage(entry, listener.isCacheWriteOnly)}
-    Saved     Key : ${entry.savedKey ?? ''}
-              Size: ${formatSize(entry.savedSize)}
-              ${getSavedMessage(entry, listener.isCacheReadOnly)}
-`
-        )
-        .join('---\n')
-
     core.summary.addRaw(`<pre>
 ${entryDetails}
 </pre>
@@ -145,10 +138,48 @@ ${entryDetails}
 `)
 }
 
-function getRestoredMessage(entry: CacheEntryListener, isCacheWriteOnly: boolean): string {
+export function logCachingReport(listener: CacheListener): void {
-    if (isCacheWriteOnly) {
+    const entries = listener.cacheEntries
+
+    core.startGroup(`Caching for gradle-build-action was ${listener.cacheStatus} - expand for details`)
+
+    core.info(
+        `Entries Restored: ${getCount(entries, e => e.restoredSize)} (${getSize(entries, e => e.restoredSize)} Mb)`
+    )
+    core.info(`Entries Saved   : ${getCount(entries, e => e.savedSize)} (${getSize(entries, e => e.savedSize)} Mb)`)
+
+    core.info(`Cache Entry Details`)
+    core.info(renderEntryDetails(listener))
+
+    core.endGroup()
+}
+
+function renderEntryDetails(listener: CacheListener): string {
+    return listener.cacheEntries
+        .map(
+            entry => `Entry: ${entry.entryName}
+    Requested Key : ${entry.requestedKey ?? ''}
+    Restored  Key : ${entry.restoredKey ?? ''}
+              Size: ${formatSize(entry.restoredSize)}
+              ${getRestoredMessage(entry, listener.cacheWriteOnly)}
+    Saved     Key : ${entry.savedKey ?? ''}
+              Size: ${formatSize(entry.savedSize)}
+              ${getSavedMessage(entry, listener.cacheReadOnly)}
+`
+        )
+        .join('---\n')
+}
+
+function getRestoredMessage(entry: CacheEntryListener, cacheWriteOnly: boolean): string {
+    if (entry.notRestored) {
+        return `(Entry not restored: ${entry.notRestored})`
+    }
+    if (cacheWriteOnly) {
         return '(Entry not restored: cache is write-only)'
     }
+    if (entry.requestedKey === undefined) {
+        return '(Entry not restored: not requested)'
+    }
     if (entry.restoredKey === undefined) {
         return '(Entry not restored: no match found)'
     }
@@ -158,12 +189,12 @@ function getRestoredMessage(entry: CacheEntryListener, isCacheWriteOnly: boolean
     return '(Entry restored: partial match found)'
 }
 
-function getSavedMessage(entry: CacheEntryListener, isCacheReadOnly: boolean): string {
+function getSavedMessage(entry: CacheEntryListener, cacheReadOnly: boolean): string {
-    if (entry.unsaved) {
+    if (entry.notSaved) {
-        return `(Entry not saved: ${entry.unsaved})`
+        return `(Entry not saved: ${entry.notSaved})`
     }
     if (entry.savedKey === undefined) {
-        if (isCacheReadOnly) {
+        if (cacheReadOnly) {
             return '(Entry not saved: cache is read-only)'
         }
         return '(Entry not saved: reason unknown)'
@@ -178,7 +209,7 @@ function getCount(
     cacheEntries: CacheEntryListener[],
     predicate: (value: CacheEntryListener) => number | undefined
 ): number {
-    return cacheEntries.filter(e => predicate(e) !== undefined).length
+    return cacheEntries.filter(e => predicate(e)).length
 }
 
 function getSize(

src/cache-utils.ts

@@ -15,6 +15,7 @@ const JOB_CONTEXT_PARAMETER = 'workflow-job-context'
 const CACHE_DISABLED_PARAMETER = 'cache-disabled'
 const CACHE_READONLY_PARAMETER = 'cache-read-only'
 const CACHE_WRITEONLY_PARAMETER = 'cache-write-only'
+const CACHE_TIMEOUT_PARAMETER = 'cache-read-timeout'
 const STRICT_CACHE_MATCH_PARAMETER = 'gradle-home-cache-strict-match'
 const CACHE_DEBUG_VAR = 'GRADLE_BUILD_ACTION_CACHE_DEBUG_ENABLED'
 
@@ -25,6 +26,9 @@ const CACHE_KEY_JOB_INSTANCE_VAR = 'GRADLE_BUILD_ACTION_CACHE_KEY_JOB_INSTANCE'
 const CACHE_KEY_JOB_EXECUTION_VAR = 'GRADLE_BUILD_ACTION_CACHE_KEY_JOB_EXECUTION'
 
 export function isCacheDisabled(): boolean {
+    if (!cache.isFeatureAvailable()) {
+        return true
+    }
     return core.getBooleanInput(CACHE_DISABLED_PARAMETER)
 }
 
@@ -40,6 +44,10 @@ export function isCacheDebuggingEnabled(): boolean {
     return process.env[CACHE_DEBUG_VAR] ? true : false
 }
 
+function getCacheReadTimeoutMs(): number {
+    return parseInt(core.getInput(CACHE_TIMEOUT_PARAMETER)) * 1000
+}
+
 /**
  * Represents a key used to restore a cache entry.
  * The Github Actions cache will first try for an exact match on the key.
@@ -145,12 +153,15 @@ export async function restoreCache(
 ): Promise<cache.CacheEntry | undefined> {
     listener.markRequested(cacheKey, cacheRestoreKeys)
     try {
-        const restoredEntry = await cache.restoreCache(cachePath, cacheKey, cacheRestoreKeys)
+        const restoredEntry = await cache.restoreCache(cachePath, cacheKey, cacheRestoreKeys, {
+            segmentTimeoutInMs: getCacheReadTimeoutMs()
+        })
         if (restoredEntry !== undefined) {
             listener.markRestored(restoredEntry.key, restoredEntry.size)
         }
         return restoredEntry
     } catch (error) {
+        listener.markNotRestored((error as Error).message)
         handleCacheFailure(error, `Failed to restore ${cacheKey}`)
         return undefined
     }
@@ -163,6 +174,8 @@ export async function saveCache(cachePath: string[], cacheKey: string, listener:
     } catch (error) {
         if (error instanceof cache.ReserveCacheError) {
             listener.markAlreadyExists(cacheKey)
+        } else {
+            listener.markNotSaved((error as Error).message)
         }
         handleCacheFailure(error, `Failed to save cache entry with path '${cachePath}' and key: ${cacheKey}`)
     }

src/caches.ts

@@ -1,6 +1,7 @@
 import * as core from '@actions/core'
 import {isCacheDisabled, isCacheReadOnly, isCacheWriteOnly} from './cache-utils'
 import {CacheListener} from './cache-reporting'
+import {DaemonController} from './daemon-controller'
 import {GradleStateCache} from './cache-base'
 
 const CACHE_RESTORED_VAR = 'GRADLE_BUILD_ACTION_CACHE_RESTORED'
@@ -19,7 +20,7 @@ export async function restore(gradleUserHome: string, cacheListener: CacheListen
         core.info('Cache is disabled: will not restore state from previous builds.')
         // Initialize the Gradle User Home even when caching is disabled.
         gradleStateCache.init()
-        cacheListener.isCacheDisabled = true
+        cacheListener.cacheDisabled = true
         return
     }
 
@@ -36,7 +37,7 @@ export async function restore(gradleUserHome: string, cacheListener: CacheListen
 
     if (isCacheWriteOnly()) {
         core.info('Cache is write-only: will not restore from cache.')
-        cacheListener.isCacheWriteOnly = true
+        cacheListener.cacheWriteOnly = true
         return
     }
 
@@ -45,32 +46,30 @@ export async function restore(gradleUserHome: string, cacheListener: CacheListen
     })
 }
 
-export async function save(gradleUserHome: string, cacheListener: CacheListener): Promise<void> {
+export async function save(
-    if (!shouldSaveCaches()) {
+    gradleUserHome: string,
+    cacheListener: CacheListener,
+    daemonController: DaemonController
+): Promise<void> {
+    if (isCacheDisabled()) {
+        core.info('Cache is disabled: will not save state for later builds.')
+        return
+    }
+
+    if (!core.getState(CACHE_RESTORED_VAR)) {
+        core.info('Cache will not be saved: not restored in main action step.')
         return
     }
 
     if (isCacheReadOnly()) {
         core.info('Cache is read-only: will not save state for use in subsequent builds.')
-        cacheListener.isCacheReadOnly = true
+        cacheListener.cacheReadOnly = true
         return
     }
 
+    await daemonController.stopAllDaemons()
+
     await core.group('Caching Gradle state', async () => {
         return new GradleStateCache(gradleUserHome).save(cacheListener)
     })
 }
-
-function shouldSaveCaches(): boolean {
-    if (isCacheDisabled()) {
-        core.info('Cache is disabled: will not save state for later builds.')
-        return false
-    }
-
-    if (!core.getState(CACHE_RESTORED_VAR)) {
-        core.info('Cache will not be saved: not restored in main action step.')
-        return false
-    }
-
-    return true
-}

src/daemon-controller.ts

@@ -0,0 +1,36 @@
+import * as core from '@actions/core'
+import * as exec from '@actions/exec'
+import * as fs from 'fs'
+import * as path from 'path'
+import {BuildResult} from './build-results'
+
+export class DaemonController {
+    private readonly gradleHomes
+
+    constructor(buildResults: BuildResult[]) {
+        const allHomes = buildResults.map(buildResult => buildResult.gradleHomeDir)
+        this.gradleHomes = Array.from(new Set(allHomes))
+    }
+
+    async stopAllDaemons(): Promise<void> {
+        core.info('Stopping all Gradle daemons before saving Gradle User Home state')
+
+        const executions: Promise<number>[] = []
+        const args = ['--stop']
+
+        for (const gradleHome of this.gradleHomes) {
+            const executable = path.resolve(gradleHome, 'bin', 'gradle')
+            if (!fs.existsSync(executable)) {
+                core.warning(`Gradle executable not found at ${executable}. Could not stop Gradle daemons.`)
+                continue
+            }
+            core.info(`Stopping Gradle daemons for ${gradleHome}`)
+            executions.push(
+                exec.exec(executable, args, {
+                    ignoreReturnCode: true
+                })
+            )
+        }
+        await Promise.all(executions)
+    }
+}

src/job-summary.ts

@@ -1,18 +1,6 @@
 import * as core from '@actions/core'
-import fs from 'fs'
+import {BuildResult} from './build-results'
-import path from 'path'
+import {writeCachingReport, CacheListener, logCachingReport} from './cache-reporting'
-import {logCachingReport, CacheListener} from './cache-reporting'
-
-export interface BuildResult {
-    get rootProjectName(): string
-    get rootProjectDir(): string
-    get requestedTasks(): string
-    get gradleVersion(): string
-    get gradleHomeDir(): string
-    get buildFailed(): boolean
-    get buildScanUri(): string
-    get buildScanFailed(): boolean
-}
 
 export async function writeJobSummary(buildResults: BuildResult[], cacheListener: CacheListener): Promise<void> {
     core.info('Writing job summary')
@@ -23,23 +11,19 @@ export async function writeJobSummary(buildResults: BuildResult[], cacheListener
         writeSummaryTable(buildResults)
     }
 
-    logCachingReport(cacheListener)
+    writeCachingReport(cacheListener)
 
     await core.summary.write()
 }
 
-export function loadBuildResults(): BuildResult[] {
+export async function logJobSummary(buildResults: BuildResult[], cacheListener: CacheListener): Promise<void> {
-    const buildResultsDir = path.resolve(process.env['RUNNER_TEMP']!, '.build-results')
+    if (buildResults.length === 0) {
-    if (!fs.existsSync(buildResultsDir)) {
+        core.debug('No Gradle build results found. Summary table will not be logged.')
-        return []
+    } else {
+        logSummaryTable(buildResults)
     }
 
-    return fs.readdirSync(buildResultsDir).map(file => {
+    logCachingReport(cacheListener)
-        // Every file in the .build-results dir should be a BuildResults JSON
-        const filePath = path.join(buildResultsDir, file)
-        const content = fs.readFileSync(filePath, 'utf8')
-        return JSON.parse(content) as BuildResult
-    })
 }
 
 function writeSummaryTable(results: BuildResult[]): void {
@@ -92,3 +76,19 @@ function renderBuildScanBadge(outcomeText: string, outcomeColor: string, targetU
     const badgeHtml = `<img src="${badgeUrl}" alt="Build Scan ${outcomeText}" />`
     return `<a href="${targetUrl}" rel="nofollow">${badgeHtml}</a>`
 }
+
+function logSummaryTable(results: BuildResult[]): void {
+    core.info('============================')
+    core.info('Gradle Builds')
+    core.info('----------------------------')
+    core.info('Root Project | Requested Tasks | Gradle Version | Build Outcome | Build Scan™')
+    core.info('----------------------------')
+    for (const result of results) {
+        core.info(
+            `${result.rootProjectName} | ${result.requestedTasks} | ${result.gradleVersion} | ${
+                result.buildFailed ? 'FAILED' : 'SUCCESS'
+            } | ${result.buildScanFailed ? 'Publish failed' : result.buildScanUri}`
+        )
+    }
+    core.info('============================')
+}

src/resources/init-scripts/build-result-capture-service.plugin.groovy

@@ -45,9 +45,15 @@ abstract class BuildResultsRecorder implements BuildService<BuildResultsRecorder
             buildScanFailed: false
         ]
 
-        def buildResultsDir = new File(System.getenv("RUNNER_TEMP"), ".build-results")
+        def runnerTempDir = System.getenv("RUNNER_TEMP")
+        def githubActionStep = System.getenv("GITHUB_ACTION")
+        if (!runnerTempDir || !githubActionStep) {
+            return
+        }
+        
+        def buildResultsDir = new File(runnerTempDir, ".build-results")
         buildResultsDir.mkdirs()
-        def buildResultsFile = new File(buildResultsDir, System.getenv("GITHUB_ACTION") + getParameters().getInvocationId().get() + ".json")
+        def buildResultsFile = new File(buildResultsDir, githubActionStep + getParameters().getInvocationId().get() + ".json")
         buildResultsFile << groovy.json.JsonOutput.toJson(buildResults)
     }
 }

src/resources/init-scripts/build-result-capture.init.gradle

@@ -106,9 +106,15 @@ class BuildResults {
     }
 
     def writeToResultsFile(boolean overwrite) {
-        def buildResultsDir = new File(System.getenv("RUNNER_TEMP"), ".build-results")
+        def runnerTempDir = System.getenv("RUNNER_TEMP")
+        def githubActionStep = System.getenv("GITHUB_ACTION")
+        if (!runnerTempDir || !githubActionStep) {
+            return
+        }
+        
+        def buildResultsDir = new File(runnerTempDir, ".build-results")
         buildResultsDir.mkdirs()
-        def buildResultsFile = new File(buildResultsDir, System.getenv("GITHUB_ACTION") + invocationId + ".json")
+        def buildResultsFile = new File(buildResultsDir, githubActionStep + invocationId + ".json")
 
         // Overwrite any contents written by buildFinished or build service, since this result is a superset.
         if (buildResultsFile.exists()) {

src/setup-gradle.ts

@@ -1,13 +1,14 @@
 import * as core from '@actions/core'
 import * as exec from '@actions/exec'
 import {SUMMARY_ENV_VAR} from '@actions/core/lib/summary'
-import * as fs from 'fs'
 import * as path from 'path'
 import * as os from 'os'
 import * as caches from './caches'
 
+import {logJobSummary, writeJobSummary} from './job-summary'
+import {loadBuildResults} from './build-results'
 import {CacheListener} from './cache-reporting'
-import {BuildResult, loadBuildResults, writeJobSummary} from './job-summary'
+import {DaemonController} from './daemon-controller'
 
 const GRADLE_SETUP_VAR = 'GRADLE_BUILD_ACTION_SETUP_COMPLETED'
 const GRADLE_USER_HOME = 'GRADLE_USER_HOME'
@@ -50,20 +51,20 @@ export async function complete(): Promise<void> {
         core.info('Gradle setup post-action only performed for first gradle-build-action step in workflow.')
         return
     }
+    core.info('In final post-action step, saving state and writing summary')
 
     const buildResults = loadBuildResults()
 
-    core.info('Stopping all Gradle daemons')
-    await stopAllDaemons(getUniqueGradleHomes(buildResults))
-
-    core.info('In final post-action step, saving state and writing summary')
-    const cacheListener: CacheListener = CacheListener.rehydrate(core.getState(CACHE_LISTENER))
-
     const gradleUserHome = core.getState(GRADLE_USER_HOME)
-    await caches.save(gradleUserHome, cacheListener)
+    const cacheListener: CacheListener = CacheListener.rehydrate(core.getState(CACHE_LISTENER))
+    const daemonController = new DaemonController(buildResults)
+
+    await caches.save(gradleUserHome, cacheListener, daemonController)
 
     if (shouldGenerateJobSummary()) {
-        writeJobSummary(buildResults, cacheListener)
+        await writeJobSummary(buildResults, cacheListener)
+    } else {
+        logJobSummary(buildResults, cacheListener)
     }
 }
 
@@ -92,28 +93,3 @@ async function determineUserHome(): Promise<string> {
     core.debug(`Determined user.home from java -version output: '${userHome}'`)
     return userHome
 }
-
-function getUniqueGradleHomes(buildResults: BuildResult[]): string[] {
-    const gradleHomes = buildResults.map(buildResult => buildResult.gradleHomeDir)
-    return Array.from(new Set(gradleHomes))
-}
-
-async function stopAllDaemons(gradleHomes: string[]): Promise<void> {
-    const executions: Promise<number>[] = []
-    const args = ['--stop']
-
-    for (const gradleHome of gradleHomes) {
-        const executable = path.resolve(gradleHome, 'bin', 'gradle')
-        if (!fs.existsSync(executable)) {
-            core.warning(`Gradle executable not found at ${executable}. Could not stop Gradle daemons.`)
-            continue
-        }
-        core.info(`Stopping Gradle daemons in ${gradleHome}`)
-        executions.push(
-            exec.exec(executable, args, {
-                ignoreReturnCode: true
-            })
-        )
-    }
-    await Promise.all(executions)
-}

test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/BaseInitScriptTest.groovy

@@ -200,20 +200,17 @@ task expectFailure {
         File initScriptsDir = new File(testProjectDir, "initScripts")
         args << '-I' << new File(initScriptsDir, initScript).absolutePath
 
-        envVars['RUNNER_TEMP'] = testProjectDir.absolutePath
+        envVars.putIfAbsent('RUNNER_TEMP', testProjectDir.absolutePath)
-        envVars['GITHUB_ACTION'] = 'github-step-id'
+        envVars.putIfAbsent('GITHUB_ACTION', 'github-step-id')
 
         def runner = ((DefaultGradleRunner) GradleRunner.create())
             .withJvmArguments(jvmArgs)
             .withGradleVersion(gradleVersion.version)
             .withProjectDir(testProjectDir)
             .withArguments(args)
+            .withEnvironment(envVars)
             .forwardOutput()
 
-        if (envVars) {
-            runner.withEnvironment(envVars)
-        }
-
         runner
     }
 

test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestBuildResultRecorder.groovy

@@ -134,6 +134,20 @@ class TestBuildResultRecorder extends BaseInitScriptTest {
         testGradleVersion << ALL_VERSIONS
     }
 
+    def "produces no build results file when GitHub env vars not set with #testGradleVersion"() {
+        assumeTrue testGradleVersion.compatibleWithCurrentJvm
+
+        when:
+        run(['help'], initScript, testGradleVersion.gradleVersion, [], [RUNNER_TEMP: '', GITHUB_ACTION: ''])
+
+        then:
+        def buildResultsDir = new File(testProjectDir, '.build-results')
+        assert !buildResultsDir.exists()
+
+        where:
+        testGradleVersion << ALL_VERSIONS
+    }
+
     void assertResults(String task, TestGradleVersion testGradleVersion, boolean hasFailure, boolean hasBuildScan, boolean scanUploadFailed = false) {
         def results = new JsonSlurper().parse(buildResultFile)
         assert results['rootProjectName'] == ROOT_PROJECT_NAME