Build outputs

When changing workflow names or when changing to the new 'dependency-submission'
action, it can be useful to clear existing dependency graph snapshots from previous
submissions. While the old graphs will eventually "age out", the 'clear' option will
submit an empty dependency graph for an existing Job correlator, ensuring that old
dependency graphs don't linger.

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

@@ -1,6 +1,6 @@
 plugins {
-    id "com.gradle.enterprise" version "3.16.1"
+    id "com.gradle.enterprise" version "3.15.1"
-    id "com.gradle.common-custom-user-data-gradle-plugin" version "1.12.1"
+    id "com.gradle.common-custom-user-data-gradle-plugin" version "1.12"
 }
 
 gradleEnterprise {

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

@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     api("org.apache.commons:commons-math3:3.6.1")
-    implementation("com.google.guava:guava:33.0.0-jre")
+    implementation("com.google.guava:guava:32.1.3-jre")
 
     testImplementation("org.junit.jupiter:junit-jupiter:5.10.1")
 }

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

@@ -1,6 +1,6 @@
 plugins {
-    id("com.gradle.enterprise") version "3.16.1"
+    id("com.gradle.enterprise") version "3.15.1"
-    id("com.gradle.common-custom-user-data-gradle-plugin") version "1.12.1"
+    id("com.gradle.common-custom-user-data-gradle-plugin") version "1.12"
 }
 
 gradleEnterprise {

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

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

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

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

.github/workflows/ci-codeql.yml

@@ -42,7 +42,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -53,7 +53,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -67,4 +67,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v2

.github/workflows/ci-full-check.yml

@@ -9,6 +9,7 @@ on:
   push:
     branches: 
       - main
+      - release/**
     paths:
       - '.github/**'
       - 'dist/**'
@@ -25,14 +26,12 @@ jobs:
       cache-key-prefix: ${{github.run_number}}-
 
   caching-config:
-    uses: ./.github/workflows/integ-test-caching-config.yml
+    uses: ./.github/workflows/integ-test-action-inputs-caching.yml
     with:
       cache-key-prefix: ${{github.run_number}}-
 
   dependency-graph:
     uses: ./.github/workflows/integ-test-dependency-graph.yml
-    permissions:
-      contents: write
     with:
       cache-key-prefix: ${{github.run_number}}-
 
@@ -58,12 +57,10 @@ jobs:
     with:
       cache-key-prefix: ${{github.run_number}}-
 
-  restore-configuration-cache:
+  # restore-configuration-cache:
-    uses: ./.github/workflows/integ-test-restore-configuration-cache.yml
+  #   uses: ./.github/workflows/integ-test-restore-configuration-cache.yml
-    with:
+  #   with:
-      cache-key-prefix: ${{github.run_number}}-
+  #     cache-key-prefix: ${{github.run_number}}-
-    secrets:
-      GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
   restore-custom-gradle-home:
     uses: ./.github/workflows/integ-test-restore-custom-gradle-home.yml

.github/workflows/ci-init-script-check.yml

@@ -20,7 +20,7 @@ jobs:
         distribution: temurin
         java-version: 8
     - name: Setup Gradle
-      uses: gradle/gradle-build-action@v2.11.0 # Use a released version to avoid breakages
+      uses: gradle/gradle-build-action@v2.10.0 # Use a released version to avoid breakages
     - name: Run integration tests
       working-directory: test/init-scripts
       run: ./gradlew check

.github/workflows/ci-quick-check.yml

@@ -3,7 +3,9 @@ name: CI-quick-check
 on:
   workflow_dispatch:
   push:
-    branches-ignore: main
+    branches-ignore: 
+    - main
+    - release/**
 
 jobs:
   build-distribution:
@@ -45,7 +47,7 @@ jobs:
 
   caching-config:
     needs: build-distribution
-    uses: ./.github/workflows/integ-test-caching-config.yml
+    uses: ./.github/workflows/integ-test-action-inputs-caching.yml
     with:
       runner-os: '["ubuntu-latest"]'
       download-dist: true
@@ -53,8 +55,6 @@ jobs:
   dependency-graph:
     needs: build-distribution
     uses: ./.github/workflows/integ-test-dependency-graph.yml
-    permissions:
-      contents: write
     with:
       runner-os: '["ubuntu-latest"]'
       download-dist: true
@@ -89,14 +89,12 @@ jobs:
       runner-os: '["ubuntu-latest"]'
       download-dist: true
 
-  restore-configuration-cache:
+  # restore-configuration-cache:
-    needs: build-distribution
+  #   needs: build-distribution
-    uses: ./.github/workflows/integ-test-restore-configuration-cache.yml
+  #   uses: ./.github/workflows/integ-test-restore-configuration-cache.yml
-    with:
+  #   with:
-      runner-os: '["ubuntu-latest"]'
+  #     runner-os: '["ubuntu-latest"]'
-      download-dist: true
+  #     download-dist: true
-    secrets:
-      GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
   restore-containerized-gradle-home:
     needs: build-distribution

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

@@ -8,6 +8,7 @@ on:
   push:
     branches: 
       - main
+      - release/**
       - dependabot/**
 
 jobs:
@@ -33,7 +34,7 @@ jobs:
       id: diff
 
     # If index.js was different than expected, upload the expected version as an artifact
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v3
       if: ${{ failure() && steps.diff.conclusion == 'failure' }}
       with:
         name: dist

.github/workflows/demo-job-summary.yml

@@ -8,7 +8,7 @@ env:
   GRADLE_BUILD_ACTION_CACHE_DEBUG_ENABLED: true
 
 jobs:
-  many-gradle-builds:
+  run-gradle-builds:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout sources
@@ -42,27 +42,6 @@ jobs:
       continue-on-error: true
       run: ./gradlew not-a-real-task
 
-  successful-builds-with-no-summary:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout sources
-      uses: actions/checkout@v4
-    - name: Build distribution
-      shell: bash
-      run: |
-        npm install
-        npm run build
-    - name: Setup Gradle
-      uses: ./
-      with:
-        add-job-summary: on-failure
-    - name: Build kotlin-dsl project
-      working-directory: .github/workflow-samples/kotlin-dsl
-      run: ./gradlew assemble
-    - name: Build kotlin-dsl project without Build Scan®
-      working-directory: .github/workflow-samples/kotlin-dsl
-      run: ./gradlew assemble check --no-scan
-
   pre-existing-gradle-home:
     runs-on: ubuntu-latest
     steps:

.github/workflows/demo-pr-build-scan-comment.yml

@@ -2,50 +2,26 @@ name: Demo adding Build Scan® comment to PR
 on:
   pull_request:
     types: [assigned, review_requested]
-
-permissions:
-  pull-requests: write
-
 jobs:
-  successful-build-with-always-comment:
+  gradle:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout project sources
       uses: actions/checkout@v4
     - name: Setup Gradle
       uses: ./
-      with:
-        add-job-summary-as-pr-comment: always
     - name: Run build with Gradle wrapper
       id: gradle
       working-directory: .github/workflow-samples/kotlin-dsl
       run: ./gradlew build --scan
-
+    - name: "Add Build Scan URL as PR comment"
-  successful-build-with-comment-on-failure:
+      uses: actions/github-script@v7
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout project sources
-      uses: actions/checkout@v4
-    - name: Setup Gradle
-      uses: ./
       with:
-        add-job-summary-as-pr-comment: on-failure
+        github-token: ${{secrets.GITHUB_TOKEN}}
-    - name: Run build with Gradle wrapper
+        script: |
-      id: gradle
+          github.rest.issues.createComment({
-      working-directory: .github/workflow-samples/kotlin-dsl
+            issue_number: context.issue.number,
-      run: ./gradlew build --scan
+            owner: context.repo.owner,
-
+            repo: context.repo.repo,
-  failing-build-with-comment-on-failure:
+            body: 'PR ready for review: ${{ steps.gradle.outputs.build-scan-url }}'
-    runs-on: ubuntu-latest
+          })
-    steps:
-    - name: Checkout project sources
-      uses: actions/checkout@v4
-    - name: Setup Gradle
-      uses: ./
-      with:
-        add-job-summary-as-pr-comment: on-failure
-    - name: Run build with Gradle wrapper
-      id: gradle
-      working-directory: .github/workflow-samples/kotlin-dsl
-      run: ./gradlew no-a-real-task --scan
-      continue-on-error: true

.github/workflows/integ-test-action-inputs-caching.yml

@@ -1,4 +1,4 @@
-name: Test caching configuration
+name: Test action inputs for caching
 
 on:
   workflow_call:
@@ -38,8 +38,7 @@ jobs:
             enterprise
         # Exclude build-cache from main cache entry
         gradle-home-cache-excludes: |
-            caches/build-cache-*
+            caches/build-cache-1
-            caches/*/executionHistory
     - name: Build using Gradle wrapper
       working-directory: .github/workflow-samples/groovy-dsl
       run: ./gradlew test
@@ -64,8 +63,7 @@ jobs:
             caches
             enterprise
         gradle-home-cache-excludes: |
-            caches/build-cache-*
+            caches/build-cache-1
-            caches/*/executionHistory
         cache-read-only: true
     - name: Execute Gradle build with --offline
       working-directory: .github/workflow-samples/groovy-dsl

.github/workflows/integ-test-dependency-graph.yml

@@ -12,9 +12,6 @@ on:
         type: boolean
         default: false
 
-permissions:
-  contents: write
-
 env:
   DOWNLOAD_DIST: ${{ inputs.download-dist }}
   GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: dependency-graph-${{ inputs.cache-key-prefix }}
@@ -34,7 +31,7 @@ jobs:
     - name: Setup Gradle for dependency-graph generate
       uses: ./
       with:
-        dependency-graph: generate-and-upload
+        dependency-graph: generate
     - name: Run gradle build
       run: ./gradlew build
       working-directory: .github/workflow-samples/groovy-dsl
@@ -58,7 +55,7 @@ jobs:
       working-directory: .github/workflow-samples/kotlin-dsl
   
   submit:
-    needs: [groovy-generate]
+    needs: [groovy-generate, kotlin-generate]
     runs-on: "ubuntu-latest"
     steps:
     - name: Checkout sources
@@ -83,7 +80,7 @@ jobs:
     - name: Setup Gradle for dependency-graph generate
       uses: ./
       with:
-        dependency-graph: generate-and-submit
+        dependency-graph: generate
     - id: gradle-assemble
       run: ./gradlew assemble
       working-directory: .github/workflow-samples/groovy-dsl

.github/workflows/integ-test-detect-java-toolchains.yml

@@ -21,7 +21,6 @@ jobs:
   # Test that pre-installed runner JDKs are detected
   pre-installed-toolchains:
     strategy:
-      fail-fast: false
       matrix:
         os: ${{fromJSON(inputs.runner-os)}}
     runs-on: ${{ matrix.os }}
@@ -36,7 +35,7 @@ jobs:
       shell: bash
       working-directory: .github/workflow-samples/groovy-dsl
       run: | 
-        gradle --info javaToolchains > output.txt
+        gradle -q javaToolchains > output.txt
         cat output.txt
     - name: Verify detected toolchains
       shell: bash
@@ -45,12 +44,10 @@ jobs:
         grep -q 'Eclipse Temurin JDK 1.8' output.txt || (echo "::error::Did not detect preinstalled JDK 1.8" && exit 1)
         grep -q 'Eclipse Temurin JDK 11' output.txt || (echo "::error::Did not detect preinstalled JDK 11" && exit 1)
         grep -q 'Eclipse Temurin JDK 17' output.txt || (echo "::error::Did not detect preinstalled JDK 17" && exit 1)
-        grep -q 'Eclipse Temurin JDK 21' output.txt || (echo "::error::Did not detect preinstalled JDK 21" && exit 1)
 
   # Test that JDKs provisioned by setup-java are detected
   setup-java-installed-toolchain:
     strategy:
-      fail-fast: false
       matrix:
         os: ${{fromJSON(inputs.runner-os)}}
     runs-on: ${{ matrix.os }}
@@ -75,19 +72,42 @@ jobs:
       shell: bash
       working-directory: .github/workflow-samples/groovy-dsl
       run: | 
-        gradle --info javaToolchains > output.txt
+        gradle -q javaToolchains > output.txt
         cat output.txt
-    - name: Verify setup JDKs are detected
+    - name: Verify detected toolchains
       shell: bash
       working-directory: .github/workflow-samples/groovy-dsl
       run: | 
         grep -q 'Eclipse Temurin JDK 16' output.txt || (echo "::error::Did not detect setup-java installed JDK 16" && exit 1)
         grep -q 'Eclipse Temurin JDK 20' output.txt || (echo "::error::Did not detect setup-java installed JDK 20" && exit 1)
-    - name: Verify pre-installed toolchains are detected
+
+  # Test that predefined JDK detection property is not overwritten by action
+  check-no-overwrite:
+    strategy:
+      matrix:
+        os: ${{fromJSON(inputs.runner-os)}}
+    runs-on: ${{ matrix.os }}
+    steps:
+    - name: Checkout sources
+      uses: actions/checkout@v4
+    - name: Download distribution if required
+      uses: ./.github/actions/download-dist
+    - name: Configure java installations env var in Gradle User Home
       shell: bash
-      working-directory: .github/workflow-samples/groovy-dsl
       run: | 
-        grep -q 'Eclipse Temurin JDK 1.8' output.txt || (echo "::error::Did not detect preinstalled JDK 1.8" && exit 1)
+        mkdir -p ~/.gradle
-        grep -q 'Eclipse Temurin JDK 11' output.txt || (echo "::error::Did not detect preinstalled JDK 11" && exit 1)
+        echo "org.gradle.java.installations.fromEnv=XXXXX" > ~/.gradle/gradle.properties
-        grep -q 'Eclipse Temurin JDK 17' output.txt || (echo "::error::Did not detect preinstalled JDK 17" && exit 1)
+    - name: Setup Gradle
-        grep -q 'Eclipse Temurin JDK 21' output.txt || (echo "::error::Did not detect preinstalled JDK 21" && exit 1)
+      uses: ./
+    - name: Check gradle.properties
+      shell: bash
+      run: |
+        cat ~/.gradle/gradle.properties
+        if grep -q 'org.gradle.java.installations.fromEnv=JAVA_HOME' ~/.gradle/gradle.properties ; then
+          echo 'Found overwritten fromEnv'
+          exit 1
+        fi
+        if ! grep -q 'org.gradle.java.installations.fromEnv=XXXXX' ~/.gradle/gradle.properties ; then
+          echo 'Did NOT find original fromEnv'
+          exit 1
+        fi

.github/workflows/integ-test-inject-gradle-enterprise.yml

@@ -21,8 +21,8 @@ env:
   GRADLE_BUILD_ACTION_CACHE_DEBUG_ENABLED: true
   GRADLE_ENTERPRISE_INJECTION_ENABLED: true
   GRADLE_ENTERPRISE_URL: https://ge.solutions-team.gradle.com
-  GRADLE_ENTERPRISE_PLUGIN_VERSION: 3.16.1
+  GRADLE_ENTERPRISE_PLUGIN_VERSION: 3.15.1
-  GRADLE_ENTERPRISE_CCUD_PLUGIN_VERSION: 1.12.1
+  GRADLE_ENTERPRISE_CCUD_PLUGIN_VERSION: 1.12
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
 
 jobs:

.github/workflows/integ-test-restore-configuration-cache.yml

@@ -11,9 +11,6 @@ on:
       download-dist:
         type: boolean
         default: false
-    secrets:
-      GRADLE_ENCRYPTION_KEY:
-        required: true
 
 env:
   DOWNLOAD_DIST: ${{ inputs.download-dist }}
@@ -37,11 +34,9 @@ jobs:
       uses: ./
       with:
         cache-read-only: false # For testing, allow writing cache entries on non-default branches
-        cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
-        gradle-version: 8.6-rc-1
     - name: Groovy build with configuration-cache enabled
       working-directory: .github/workflow-samples/groovy-dsl
-      run: gradle test --configuration-cache
+      run: ./gradlew test --configuration-cache
 
   verify-build-groovy:
     env:
@@ -60,12 +55,10 @@ jobs:
       uses: ./
       with:
         cache-read-only: true
-        cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
-        gradle-version: 8.6-rc-1
     - name: Groovy build with configuration-cache enabled
       id: execute
       working-directory: .github/workflow-samples/groovy-dsl
-      run: gradle test --configuration-cache
+      run: ./gradlew test --configuration-cache
     - name: Check that configuration-cache was used
       uses: actions/github-script@v7
       with:
@@ -95,11 +88,9 @@ 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: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
-        gradle-version: 8.6-rc-1
     - name: Check execute Gradle build with configuration cache enabled (but not restored)
       working-directory: .github/workflow-samples/groovy-dsl
-      run: gradle test --configuration-cache
+      run: ./gradlew test --configuration-cache
 
   seed-build-kotlin:
     env:
@@ -117,11 +108,9 @@ jobs:
       uses: ./
       with:
         cache-read-only: false # For testing, allow writing cache entries on non-default branches
-        cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
-        gradle-version: 8.6-rc-1
     - name: Execute 'help' with configuration-cache enabled
       working-directory: .github/workflow-samples/kotlin-dsl
-      run: gradle help --configuration-cache
+      run: ./gradlew help --configuration-cache
 
   modify-build-kotlin:
     env:
@@ -140,11 +129,9 @@ jobs:
       uses: ./
       with:
         cache-read-only: false # For testing, allow writing cache entries on non-default branches
-        cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
-        gradle-version: 8.6-rc-1
     - name: Execute 'test' with configuration-cache enabled
       working-directory: .github/workflow-samples/kotlin-dsl
-      run: gradle test --configuration-cache
+      run: ./gradlew test --configuration-cache
 
   # Test restore configuration-cache from the third build invocation
   verify-build-kotlin:
@@ -164,12 +151,10 @@ jobs:
       uses: ./
       with:
         cache-read-only: true
-        cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
-        gradle-version: 8.6-rc-1
     - name: Execute 'test' again with configuration-cache enabled
       id: execute
       working-directory: .github/workflow-samples/kotlin-dsl
-      run: gradle test --configuration-cache
+      run: ./gradlew test --configuration-cache
     - name: Check that configuration-cache was used
       uses: actions/github-script@v7
       with:

.tool-versions

@@ -1,3 +1,3 @@
 # Configuration file for asdf version manager
-nodejs 20.10.0
+nodejs 16.18.1
 gradle 8.5

README.md

@@ -4,7 +4,7 @@ This GitHub Action can be used to configure Gradle and optionally execute a Grad
 
 ## Why use the `gradle-build-action`?
 
-It is possible to directly invoke Gradle in your workflow, and the `actions/setup-java@v4` action provides a simple way to cache Gradle dependencies. 
+It is possible to directly invoke Gradle in your workflow, and the `actions/setup-java@v3` action provides a simple way to cache Gradle dependencies. 
 
 However, the `gradle-build-action` offers a number of advantages over this approach:
 
@@ -36,7 +36,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-java@v4
+    - uses: actions/setup-java@v3
       with:
         distribution: temurin
         java-version: 11
@@ -85,7 +85,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-java@v4
+    - uses: actions/setup-java@v3
       with:
         distribution: temurin
         java-version: 11
@@ -97,6 +97,7 @@ jobs:
     - run: echo "The release-candidate version was ${{ steps.setup-gradle.outputs.gradle-version }}"
 ```
 
+
 ## Caching build state between Jobs
 
 The `gradle-build-action` will use the GitHub Actions cache to save and restore reusable state that may be speed up a subsequent build invocation. This includes most content that is downloaded from the internet as part of a build, as well as expensive to create content like compiled build scripts, transformed Jar files, etc.
@@ -160,31 +161,6 @@ If you want override the default and have the `gradle-build-action` caches overw
 cache-overwrite-existing: true
 ```
 
-### Saving configuration-cache data
-
-When Gradle is executed with the [configuration-cache](https://docs.gradle.org/current/userguide/configuration_cache.html) enabled, the configuration-cache data is stored
-in the project directory, at `<project-dir>/.gradle/configuration-cache`. Due to the way the configuration-cache works, [this file may contain stored credentials and other
-secrets](https://docs.gradle.org/release-nightly/userguide/configuration_cache.html#config_cache:secrets), and this data needs to be encrypted in order to be safely stored in the GitHub Actions cache.
-
-In order to benefit from configuration caching in your GitHub Actions workflow, you must:
-- Execute your build with Gradle 8.6 or newer. This can be achieved directly, or via the Gradle Wrapper.
-- Enable the configuration cache for your build.
-- Generate a [valid Gradle encryption key](https://docs.gradle.org/8.6-rc-1/userguide/configuration_cache.html#config_cache:secrets:configuring_encryption_key) and save it as a [GitHub Actions secret](https://docs.github.com/en/actions/security-guides/using-secrets-in-github-actions).
-- Provide the secret key via the `cache-encryption-key` action parameter.
-
-```yaml
-jobs:
-  gradle-with-configuration-cache:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - uses: gradle/gradle-build-action@v3
-      with:
-        gradle-version: 8.6-rc-1
-        cache-encryption-key: ${{ secrets.GradleEncryptionKey }}
-    - run: gradle build --configuration-cache
-```
-
 ### Incompatibility with other caching mechanisms
 
 When using `gradle-build-action` we recommend that you avoid using other mechanisms to save and restore the Gradle User Home. 
@@ -259,9 +235,9 @@ This allows the most recent state to always be available in the GitHub actions c
 ### Finding a matching cache entry
 
 In most cases, no exact match will exist for the cache key. Instead, the Gradle User Home will be restored for the closest matching cache entry, using a set of "restore keys". The entries will be matched with the following precedence:
-- An exact match on OS, workflow name, job id, matrix and Git SHA
+- An exact match on OS, workflow, job, matrix and Git SHA
-- The most recent entry saved for the same OS, workflow name, job id and matrix values
+- The most recent entry saved for the same OS, workflow, job and matrix values
-- The most recent entry saved for the same OS and job id
+- The most recent entry saved for the same OS, workflow and job
 - The most recent entry saved for the same OS
 
 Due to branch scoping of cache entries, the above match will be first performed for entries from the same branch, and then for the default ('main') branch.
@@ -368,57 +344,62 @@ gradle-home-cache-cleanup: true
 
 ## Build reporting
 
-The `gradle-build-action` collects information about any Gradle executions that occur in a workflow, including the root project,
+The `gradle-build-action` collects information about any Gradle executions that occur in a workflow, and reports these via
-requested tasks, build outcome and any Build Scan link generated. Details of cache entries read and written are also collected.
+a Job Summary, visible in the GitHub Actions UI. For each Gradle execution, details about the invocation are listed, together with
-These details are compiled into a Job Summary, which is visible in the GitHub Actions UI.
+a link to any Build Scan® published.
 
-Generation of a Job Summary is enabled by default for all Jobs using the `gradle-build-action`. This feature can be configured
+Generation of a Job Summary is enabled by default. If this is not desired, it can be disable as follows:
-so that a Job Summary is never generated, or so that a Job Summary is only generated on build failure:
 ```yaml
-add-job-summary: 'on-failure' # Valid values are 'always' (default), 'never', and 'on-failure'
+generate-job-summary: false
 ```
 
-### Adding Job Summary as a Pull Request comment
+Note that the action collects information about Gradle invocations via an [Initialization Script](https://docs.gradle.org/current/userguide/init_scripts.html#sec:using_an_init_script)
+located at `USER_HOME/.gradle/init.d/build-result-capture.init.gradle`.
+If you are using init scripts for the [Gradle Enterprise Gradle Plugin](https://plugins.gradle.org/plugin/com.gradle.enterprise) like
+[`scans-init.gradle` or `gradle-enterprise-init.gradle`](https://docs.gradle.com/enterprise/gradle-plugin/#scans_gradle_com),
+you'll need to ensure these files are applied prior to `build-result-capture.init.gradle`.
+Since Gradle applies init scripts in alphabetical order, one way to ensure this is via file naming.
 
-It is sometimes more convenient to view the results of a GitHub Actions Job directly from the Pull Request that triggered
+### Build Scan® link as Step output
-the Job. For this purpose you can configure the action so that Job Summary data is added as a Pull Request comment.
 
+As well as reporting the [Build Scan](https://gradle.com/build-scans/) link in the Job Summary,
+the `gradle-build-action` action makes this link available as a Step output named `build-scan-url`.
+
+You can then use that link in subsequent actions of your workflow. For example:
 
 ```yaml
-name: CI
+# .github/workflows/gradle-build-pr.yml
-on:
+name: Run Gradle on PRs
-  pull_request:
+on: pull_request
-
-permissions:
-  pull-requests: write
-
 jobs:
-  run-gradle-build:
+  gradle:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout project sources
       uses: actions/checkout@v4
     - name: Setup Gradle
-      uses: gradle/gradle-build-action@v3
+      uses: gradle/gradle-build-action@v2
+    - name: Run build with Gradle wrapper
+      id: gradle
+      run: ./gradlew build --scan
+    - name: "Add Build Scan URL as PR comment"
+      uses: actions/github-script@v5
+      if: github.event_name == 'pull_request' && failure()
       with:
-        add-job-summary-as-pr-comment: on-failure # Valid values are 'never' (default), 'always', and 'on-failure'
+        github-token: ${{secrets.GITHUB_TOKEN}}
-    - run: ./gradlew build --scan
+        script: |
+          github.rest.issues.createComment({
+            issue_number: context.issue.number,
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            body: '❌ ${{ github.workflow }} failed: ${{ steps.gradle.outputs.build-scan-url }}'
+          })
 ```
 
-Note that in order to add a Pull Request comment, the workflow must be configured with the `pull-requests: write` permission.
+### Saving build outputs
 
-
+By default, a GitHub Actions workflow using `gradle-build-action` will record the log output and any Build Scan links for your build,
-### Build Scan® link as Step output
+but any output files generated by the build will not be saved.
-
-As well as reporting all [Build Scan](https://gradle.com/build-scans/) links in the Job Summary,
-the `gradle-build-action` action makes this link available an an output of any Step that executes Gradle.
-
-The output name is `build-scan-url`. You can then use the build scan link in subsequent actions of your workflow. 
-
-### Saving arbitrary build outputs
-
-By default, a GitHub Actions workflow using `gradle-build-action` will record the log output and any Build Scan 
-links for your build, but any output files generated by the build will not be saved.
 
 To save selected files from your build execution, you can use the core [Upload-Artifact](https://github.com/actions/upload-artifact) action.
 For example:
@@ -442,13 +423,102 @@ jobs:
         path: build/reports/
 ```
 
-### Use of custom init-scripts in Gradle User Home
+## Use the action to invoke Gradle
 
-Note that the action collects information about Gradle invocations via an [Initialization Script](https://docs.gradle.org/current/userguide/init_scripts.html#sec:using_an_init_script)
+If the `gradle-build-action` is configured with an `arguments` input, then Gradle will execute a Gradle build with the arguments provided. NOTE: We recommend using the `gradle-build-action` as a "Setup Gradle" step as described above, with Gradle being invoked via a regular `run` command.
-located at `USER_HOME/.gradle/init.d/gradle-build-action.build-result-capture.init.gradle`.
 
-If you are adding any custom init scripts to the `USER_HOME/.gradle/init.d` directory, it may be necessary to ensure these files are applied prior to `gradle-build-action.build-result-capture.init.gradle`.
+If no `arguments` are provided, the action will not execute Gradle, but will still cache Gradle state and configure build-scan capture for all subsequent Gradle executions.
-Since Gradle applies init scripts in alphabetical order, one way to ensure this is via file naming.
+
+```yaml
+name: Run Gradle on PRs
+on: pull_request
+jobs:
+  gradle:
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v3
+      with:
+        distribution: temurin
+        java-version: 11
+    
+    - name: Setup and execute Gradle 'test' task
+      uses: gradle/gradle-build-action@v2
+      with:
+        arguments: test
+```
+
+### Multiple Gradle executions in the same Job
+
+It is possible to configure multiple Gradle executions to run sequentially in the same job. 
+The initial Action step will perform the Gradle setup.
+
+```yaml
+- uses: gradle/gradle-build-action@v2
+  with:
+    arguments: assemble
+- uses: gradle/gradle-build-action@v2
+  with:
+    arguments: check
+```
+
+### Gradle command-line arguments
+
+The `arguments` input can be used to pass arbitrary arguments to the `gradle` command line.
+Arguments can be supplied in a single line, or as a multi-line input.
+
+Here are some valid examples:
+```yaml
+arguments: build
+arguments: check --scan
+arguments: some arbitrary tasks
+arguments: build -PgradleProperty=foo
+arguments: |
+    build
+    --scan
+    -PgradleProperty=foo
+    -DsystemProperty=bar
+```
+
+If you need to pass environment variables, use the GitHub Actions workflow syntax:
+
+```yaml
+- uses: gradle/gradle-build-action@v2
+  env:
+    CI: true
+  with:
+    arguments: build
+```
+
+### Gradle build located in a subdirectory
+
+By default, the action will execute Gradle in the root directory of your project. 
+Use the `build-root-directory` input to target a Gradle build in a subdirectory.
+
+```yaml
+- uses: gradle/gradle-build-action@v2
+  with:
+    arguments: build
+    build-root-directory: some/subdirectory
+```
+
+### Using a specific Gradle executable
+
+The action will first look for a Gradle wrapper script in the root directory of your project. 
+If not found, `gradle` will be executed from the PATH.
+Use the `gradle-executable` input to execute using a specific Gradle installation.
+
+```yaml
+ - uses: gradle/gradle-build-action@v2
+   with:
+     arguments: build
+     gradle-executable: /path/to/installed/gradle
+```
+
+This mechanism can also be used to target a Gradle wrapper script that is located in a non-default location.
 
 ## Support for GitHub Enterprise Server (GHES)
 
@@ -799,7 +869,7 @@ name: Run build with Gradle Enterprise injection
 env:
   GRADLE_ENTERPRISE_INJECTION_ENABLED: true
   GRADLE_ENTERPRISE_URL: https://ge.gradle.org
-  GRADLE_ENTERPRISE_PLUGIN_VERSION: 3.16.1
+  GRADLE_ENTERPRISE_PLUGIN_VERSION: 3.15.1
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_KEY }} # Required to publish scans to ge.gradle.org
 
 jobs:
@@ -813,7 +883,7 @@ jobs:
       run: ./gradlew build
 ```
 
-This configuration will automatically apply `v3.16.1` of the [Gradle Enterprise Gradle plugin](https://docs.gradle.com/enterprise/gradle-plugin/), and publish build scans to https://ge.gradle.org.
+This configuration will automatically apply `v3.15.1` of the [Gradle Enterprise Gradle plugin](https://docs.gradle.com/enterprise/gradle-plugin/), and publish build scans to https://ge.gradle.org.
 
 Note that the `ge.gradle.org` server requires authentication in order to publish scans. The provided `GRADLE_ENTERPRISE_ACCESS_KEY` isn't required by the Gradle Enterprise injection script, 
 but will be used by the GE plugin in order to authenticate with the server.

action.yml

@@ -8,6 +8,14 @@ inputs:
     description: Gradle version to use. If specified, this Gradle version will be downloaded, added to the PATH and used for invoking Gradle.
     required: false
 
+  gradle-executable:
+    description: Path to the Gradle executable. If specified, this executable will be added to the PATH and used for invoking Gradle.
+    required: false
+
+  build-root-directory:
+    description: Path to the root directory of the build. Default is the root of the GitHub workspace.
+    required: false
+
   cache-disabled:
     description: When 'true', all caching is disabled. No entries will be written to or read from the cache.
     required: false
@@ -32,13 +40,6 @@ inputs:
     required: false
     default: false
 
-  cache-encryption-key:
-    description: |
-      A base64 encoded AES key used to encrypt the configuration-cache data. The key is exported as 'GRADLE_ENCRYPTION_KEY' for later steps. 
-      A suitable key can be generated with `openssl rand -base64 16`.
-      Configuration-cache data will not be saved/restored without an encryption key being provided.
-    required: false
-
   gradle-home-cache-includes:
     description: Paths within Gradle User Home to cache.
     required: false
@@ -58,18 +59,17 @@ inputs:
     required: false
     default: false
 
-  add-job-summary:
+  arguments:
-    description: Specifies when a Job Summary should be inluded in the action results. Valid values are 'never', 'always' (default), and 'on-failure'.
+    description: Gradle command line arguments (supports multi-line input)
     required: false
-    default: 'always'
 
-  add-job-summary-as-pr-comment:
+  generate-job-summary:
-    description: Specifies when each Job Summary should be added as a PR comment. Valid values are 'never' (default), 'always', and 'on-failure'. No action will be taken if the workflow was not triggered from a pull request.
+    description: When 'false', no Job Summary will be generated for the Job.
     required: false
-    default: 'never'
+    default: true
 
   dependency-graph:
-    description: Specifies if a GitHub dependency snapshot should be generated for each Gradle build, and if so, how. Valid values are 'disabled' (default), 'generate', 'generate-and-submit', 'generate-and-upload' and 'download-and-submit'.
+    description: Specifies if a GitHub dependency snapshot should be generated for each Gradle build, and if so, how. Valid values are 'disabled' (default), 'generate', 'generate-and-submit', 'download-and-submit' and 'clear'.
     required: false
     default: 'disabled'
 
@@ -77,28 +77,6 @@ inputs:
     description: Specifies the number of days to retain any artifacts generated by the action. If not set, the default retention settings for the repository will apply.
     required: false
 
-  # DEPRECATED ACTION INPUTS
-  arguments:
-    description: Gradle command line arguments (supports multi-line input)
-    required: false
-    deprecation-message: Using the action to execute Gradle directly is deprecated in favor of using the action to setup Gradle, and executing Gradle in a subsequent Step. See https://github.com/gradle/gradle-build-action?tab=readme-ov-file#use-the-action-to-setup-gradle. 
-
-  build-root-directory:
-    description: Path to the root directory of the build. Default is the root of the GitHub workspace.
-    required: false
-    deprecation-message: Using the action to execute Gradle directly is deprecated in favor of using the action to setup Gradle, and executing Gradle in a subsequent Step. See https://github.com/gradle/gradle-build-action?tab=readme-ov-file#use-the-action-to-setup-gradle. 
-
-  gradle-executable:
-    description: Path to the Gradle executable. If specified, this executable will be added to the PATH and used for invoking Gradle.
-    required: false
-    deprecation-message: Using the action to execute Gradle directly is deprecated in favor of using the action to setup Gradle, and executing Gradle in a subsequent Step. See https://github.com/gradle/gradle-build-action?tab=readme-ov-file#use-the-action-to-setup-gradle. 
-
-  generate-job-summary:
-    description: When 'false', no Job Summary will be generated for the Job.
-    required: false
-    default: true
-    deprecation-message: Superceded by the new 'add-job-summary' and 'add-job-summary-as-pr-comment' parameters.
-
   # EXPERIMENTAL & INTERNAL ACTION INPUTS
   # The following action properties allow fine-grained tweaking of the action caching behaviour.
   # These properties are experimental and not (yet) designed for production use, and may change without notice in a subsequent release of `gradle-build-action`.
@@ -107,7 +85,6 @@ inputs:
     description: When 'true', the action will not attempt to restore the Gradle User Home entries from other Jobs.
     required: false
     default: false
-    
   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
@@ -127,7 +104,7 @@ outputs:
     description: Version of Gradle that was setup by the action
 
 runs:
-  using: 'node20'
+  using: 'node16'
   main: 'dist/main/index.js'
   post: 'dist/post/index.js'
 

actions/clear-dependency-graph/action.yml

@@ -1,24 +0,0 @@
-name: 'Clear dependency graph for a correlator'
-
-inputs:
-  job-correlator:
-    required: true
-
-runs:
-  using: "composite"
-  steps:
-  - name: Set current timestamp as env variable
-    shell: bash
-    run: echo "NOW=$(date -Iseconds)" >> $GITHUB_ENV
-  - name: Submit empty dependency graph
-    shell: bash
-    run: |
-      curl -L \
-      -X POST \
-      -H "Accept: application/vnd.github+json" \
-      -H "Authorization: Bearer ${{ github.token }}" \
-      -H "X-GitHub-Api-Version: 2022-11-28" \
-      https://api.github.com/repos/${{ github.repository }}/dependency-graph/snapshots \
-      -d '{ "version" : 0, "job" : { "id" : "${{ github.run_id }}", "correlator" : "${{ inputs.job-correlator }} " }, "sha" : "${{ github.sha }}", "ref" : "${{ github.ref }}",  "detector" : { "name" : "GitHub Dependency Graph Gradle Plugin", "version" : "0.0.3", "url" : "https://github.com/gradle/github-dependency-graph-gradle-plugin" }, "manifests" : {}, "scanned" : "${{ env.NOW }}" }'
-  - run: echo "::notice ::Cleared dependency graph for job correlator '${{ inputs.job-correlator }}'"
-    shell: bash

package.json

@@ -8,9 +8,11 @@
     "format": "prettier --write **/*.ts",
     "format-check": "prettier --check **/*.ts",
     "lint": "eslint src/**/*.ts",
+
     "compile-main": "ncc build src/main.ts --out dist/main --source-map --no-source-map-register",
     "compile-post": "ncc build src/post.ts --out dist/post --source-map --no-source-map-register",
     "compile": "npm run compile-main && npm run compile-post",
+
     "test": "jest",
     "check": "npm run format && npm run lint",
     "build": "npm run check && npm run compile",
@@ -28,29 +30,28 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@actions/artifact": "2.0.0",
+    "@actions/artifact": "1.1.2",
     "@actions/cache": "3.2.2",
     "@actions/core": "1.10.1",
     "@actions/exec": "1.1.1",
-    "@actions/github": "6.0.0",
+    "@actions/github": "5.1.1",
     "@actions/glob": "0.4.0",
     "@actions/http-client": "2.2.0",
     "@actions/tool-cache": "2.0.1",
     "@octokit/rest": "19.0.13",
     "@octokit/webhooks-types": "7.3.1",
-    "semver": "7.5.4",
     "string-argv": "0.3.2"
   },
   "devDependencies": {
+    "@types/node": "16.18.38",
     "@types/jest": "29.5.11",
-    "@types/node": "20.10.0",
     "@types/unzipper": "0.10.9",
-    "@typescript-eslint/parser": "6.17.0",
+    "@typescript-eslint/parser": "6.14.0",
     "@vercel/ncc": "0.38.1",
-    "eslint": "8.56.0",
+    "eslint": "8.55.0",
     "eslint-plugin-github": "4.10.1",
-    "eslint-plugin-jest": "27.6.1",
+    "eslint-plugin-jest": "27.6.0",
-    "eslint-plugin-prettier": "5.1.2",
+    "eslint-plugin-prettier": "5.0.1",
     "jest": "29.7.0",
     "js-yaml": "4.1.0",
     "patch-package": "8.0.0",

src/cache-base.ts

@@ -1,13 +1,11 @@
 import * as core from '@actions/core'
 import * as exec from '@actions/exec'
-import * as glob from '@actions/glob'
-
 import path from 'path'
 import fs from 'fs'
 import * as params from './input-params'
 import {CacheListener} from './cache-reporting'
 import {saveCache, restoreCache, cacheDebug, isCacheDebuggingEnabled, tryDelete, generateCacheKey} from './cache-utils'
-import {GradleHomeEntryExtractor, ConfigurationCacheEntryExtractor} from './cache-extract-entries'
+import {GradleHomeEntryExtractor} from './cache-extract-entries'
 
 const RESTORED_CACHE_KEY_KEY = 'restored-cache-key'
 
@@ -17,24 +15,22 @@ export class GradleStateCache {
     private cacheName: string
     private cacheDescription: string
 
-    protected readonly userHome: string
     protected readonly gradleUserHome: string
 
-    constructor(userHome: string, gradleUserHome: string) {
+    constructor(gradleUserHome: string) {
-        this.userHome = userHome
         this.gradleUserHome = gradleUserHome
         this.cacheName = 'gradle'
         this.cacheDescription = 'Gradle User Home'
     }
 
     init(): void {
-        this.initializeGradleUserHome()
+        const actionCacheDir = path.resolve(this.gradleUserHome, '.gradle-build-action')
+        fs.mkdirSync(actionCacheDir, {recursive: true})
 
-        // Export the GRADLE_ENCRYPTION_KEY variable if provided
+        const initScriptsDir = path.resolve(this.gradleUserHome, 'init.d')
-        const encryptionKey = params.getCacheEncryptionKey()
+        fs.mkdirSync(initScriptsDir, {recursive: true})
-        if (encryptionKey) {
+
-            core.exportVariable('GRADLE_ENCRYPTION_KEY', encryptionKey)
+        this.initializeGradleUserHome(this.gradleUserHome, initScriptsDir)
-        }
     }
 
     cacheOutputExists(): boolean {
@@ -83,7 +79,7 @@ export class GradleStateCache {
     async afterRestore(listener: CacheListener): Promise<void> {
         await this.debugReportGradleUserHomeSize('as restored from cache')
         await new GradleHomeEntryExtractor(this.gradleUserHome).restore(listener)
-        await new ConfigurationCacheEntryExtractor(this.gradleUserHome).restore(listener)
+        // await new ConfigurationCacheEntryExtractor(this.gradleUserHome).restore(listener)
         await this.debugReportGradleUserHomeSize('after restoring common artifacts')
     }
 
@@ -131,10 +127,10 @@ export class GradleStateCache {
      */
     async beforeSave(listener: CacheListener): Promise<void> {
         await this.debugReportGradleUserHomeSize('before saving common artifacts')
-        await this.deleteExcludedPaths()
+        this.deleteExcludedPaths()
         await Promise.all([
-            new GradleHomeEntryExtractor(this.gradleUserHome).extract(listener),
+            new GradleHomeEntryExtractor(this.gradleUserHome).extract(listener)
-            new ConfigurationCacheEntryExtractor(this.gradleUserHome).extract(listener)
+            // new ConfigurationCacheEntryExtractor(this.gradleUserHome).extract(listener)
         ])
         await this.debugReportGradleUserHomeSize(
             "after extracting common artifacts (only 'caches' and 'notifications' will be stored)"
@@ -144,21 +140,13 @@ export class GradleStateCache {
     /**
      * Delete any file paths that are excluded by the `gradle-home-cache-excludes` parameter.
      */
-    private async deleteExcludedPaths(): Promise<void> {
+    private deleteExcludedPaths(): void {
         const rawPaths: string[] = params.getCacheExcludes()
-        rawPaths.push('caches/*/cc-keystore')
         const resolvedPaths = rawPaths.map(x => path.resolve(this.gradleUserHome, x))
 
         for (const p of resolvedPaths) {
-            cacheDebug(`Removing excluded path: ${p}`)
+            cacheDebug(`Deleting excluded path: ${p}`)
-            const globber = await glob.create(p, {
+            tryDelete(p)
-                implicitDescendants: false
-            })
-
-            for (const toDelete of await globber.glob()) {
-                cacheDebug(`Removing excluded file: ${toDelete}`)
-                await tryDelete(toDelete)
-            }
         }
     }
 
@@ -183,21 +171,23 @@ export class GradleStateCache {
         return path.resolve(this.gradleUserHome, rawPath)
     }
 
-    private initializeGradleUserHome(): void {
+    private initializeGradleUserHome(gradleUserHome: string, initScriptsDir: string): void {
-        // Create a directory for storing action metadata
+        // Ensure that pre-installed java versions are detected. Only add property if it isn't already defined.
-        const actionCacheDir = path.resolve(this.gradleUserHome, '.gradle-build-action')
+        const gradleProperties = path.resolve(gradleUserHome, 'gradle.properties')
-        fs.mkdirSync(actionCacheDir, {recursive: true})
+        const existingGradleProperties = fs.existsSync(gradleProperties)
-
+            ? fs.readFileSync(gradleProperties, 'utf8')
-        this.copyInitScripts()
+            : ''
-
+        if (!existingGradleProperties.includes('org.gradle.java.installations.fromEnv=')) {
-        // Copy the default toolchain definitions to `~/.m2/toolchains.xml`
+            fs.appendFileSync(
-        this.registerToolchains()
+                gradleProperties,
+                `
+# Auto-detect pre-installed JDKs
+org.gradle.java.installations.fromEnv=JAVA_HOME_8_X64,JAVA_HOME_11_X64,JAVA_HOME_17_X64
+`
+            )
         }
 
-    private copyInitScripts(): void {
+        // Copy init scripts from src/resources
-        // Copy init scripts from src/resources to Gradle UserHome
-        const initScriptsDir = path.resolve(this.gradleUserHome, 'init.d')
-        fs.mkdirSync(initScriptsDir, {recursive: true})
         const initScriptFilenames = [
             'gradle-build-action.build-result-capture.init.gradle',
             'gradle-build-action.build-result-capture-service.plugin.groovy',
@@ -206,36 +196,15 @@ export class GradleStateCache {
             'gradle-build-action.inject-gradle-enterprise.init.gradle'
         ]
         for (const initScriptFilename of initScriptFilenames) {
-            const initScriptContent = this.readResourceFileAsString('init-scripts', initScriptFilename)
+            const initScriptContent = this.readInitScriptAsString(initScriptFilename)
             const initScriptPath = path.resolve(initScriptsDir, initScriptFilename)
             fs.writeFileSync(initScriptPath, initScriptContent)
         }
     }
 
-    private registerToolchains(): void {
+    private readInitScriptAsString(resource: string): string {
-        const preInstalledToolchains = this.readResourceFileAsString('toolchains.xml')
-        const m2dir = path.resolve(this.userHome, '.m2')
-        const toolchainXmlTarget = path.resolve(m2dir, 'toolchains.xml')
-        if (!fs.existsSync(toolchainXmlTarget)) {
-            // Write a new toolchains.xml file if it doesn't exist
-            fs.mkdirSync(m2dir, {recursive: true})
-            fs.writeFileSync(toolchainXmlTarget, preInstalledToolchains)
-
-            core.info(`Wrote default JDK locations to ${toolchainXmlTarget}`)
-        } else {
-            // Merge into an existing toolchains.xml file
-            const existingToolchainContent = fs.readFileSync(toolchainXmlTarget, 'utf8')
-            const appendedContent = preInstalledToolchains.split('<toolchains>').pop()!
-            const mergedContent = existingToolchainContent.replace('</toolchains>', appendedContent)
-
-            fs.writeFileSync(toolchainXmlTarget, mergedContent)
-            core.info(`Merged default JDK locations into ${toolchainXmlTarget}`)
-        }
-    }
-
-    private readResourceFileAsString(...paths: string[]): string {
         // Resolving relative to __dirname will allow node to find the resource at runtime
-        const absolutePath = path.resolve(__dirname, '..', '..', 'src', 'resources', ...paths)
+        const absolutePath = path.resolve(__dirname, '..', '..', 'src', 'resources', 'init-scripts', resource)
         return fs.readFileSync(absolutePath, 'utf8')
     }
 

src/cache-extract-entries.ts

@@ -2,14 +2,13 @@ import path from 'path'
 import fs from 'fs'
 import * as core from '@actions/core'
 import * as glob from '@actions/glob'
-import * as semver from 'semver'
 
 import * as params from './input-params'
 
 import {META_FILE_DIR} from './cache-base'
 import {CacheEntryListener, CacheListener} from './cache-reporting'
 import {cacheDebug, getCacheKeyPrefix, hashFileNames, restoreCache, saveCache, tryDelete} from './cache-utils'
-import {BuildResult, loadBuildResults} from './build-results'
+import {loadBuildResults} from './build-results'
 
 const SKIP_RESTORE_VAR = 'GRADLE_BUILD_ACTION_SKIP_RESTORE'
 
@@ -47,7 +46,6 @@ class ExtractedCacheEntryDefinition {
     pattern: string
     bundle: boolean
     uniqueFileNames = true
-    notCacheableReason: string | undefined
 
     constructor(artifactType: string, pattern: string, bundle: boolean) {
         this.artifactType = artifactType
@@ -55,24 +53,10 @@ class ExtractedCacheEntryDefinition {
         this.bundle = bundle
     }
 
-    /**
-     * Indicate that the file names matching the cache entry pattern are NOT sufficient to uniquely identify the contents.
-     * If the file names are sufficient, then we use a hash of the file names to identify the entry.
-     * With non-unique-file-names, we hash the file contents to identify the cache entry.
-     */
     withNonUniqueFileNames(): ExtractedCacheEntryDefinition {
         this.uniqueFileNames = false
         return this
     }
-
-    /**
-     * Specify that the cache entry, should not be saved for some reason, even though the contents exist.
-     * This is used to prevent configuration-cache entries being cached when they were generated by Gradle < 8.6,
-     */
-    notCacheableBecause(reason: string): ExtractedCacheEntryDefinition {
-        this.notCacheableReason = reason
-        return this
-    }
 }
 
 /**
@@ -158,11 +142,6 @@ abstract class AbstractEntryExtractor {
             const artifactType = cacheEntryDefinition.artifactType
             const pattern = cacheEntryDefinition.pattern
 
-            if (cacheEntryDefinition.notCacheableReason) {
-                listener.entry(pattern).markNotSaved(cacheEntryDefinition.notCacheableReason)
-                continue
-            }
-
             // Find all matching files for this cache entry definition
             const globber = await glob.create(pattern, {
                 implicitDescendants: false
@@ -277,7 +256,7 @@ abstract class AbstractEntryExtractor {
         }
 
         const filedata = fs.readFileSync(cacheMetadataFile, 'utf-8')
-        cacheDebug(`Loaded cache metadata for ${this.extractorName}: ${filedata}`)
+        cacheDebug(`Loaded cache metadata: ${filedata}`)
         const extractedCacheEntryMetadata = JSON.parse(filedata) as ExtractedCacheEntryMetadata
         return extractedCacheEntryMetadata.entries
     }
@@ -285,12 +264,12 @@ abstract class AbstractEntryExtractor {
     /**
      * Saves information about the extracted cache entries into the 'cache-metadata.json' file.
      */
-    protected saveMetadataForCacheResults(results: ExtractedCacheEntry[]): void {
+    private saveMetadataForCacheResults(results: ExtractedCacheEntry[]): void {
         const extractedCacheEntryMetadata = new ExtractedCacheEntryMetadata()
         extractedCacheEntryMetadata.entries = results.filter(x => x.cacheKey !== undefined)
 
         const filedata = JSON.stringify(extractedCacheEntryMetadata)
-        cacheDebug(`Saving cache metadata for ${this.extractorName}: ${filedata}`)
+        cacheDebug(`Saving cache metadata: ${filedata}`)
 
         fs.writeFileSync(this.getCacheMetadataFile(), filedata, 'utf-8')
     }
@@ -372,96 +351,37 @@ export class ConfigurationCacheEntryExtractor extends AbstractEntryExtractor {
      * entry is not reusable.
      */
     async restore(listener: CacheListener): Promise<void> {
-        if (!listener.fullyRestored) {
+        if (listener.fullyRestored) {
-            this.markNotRestored(listener, 'Gradle User Home was not fully restored')
+            return super.restore(listener)
-            return
         }
 
-        if (!params.getCacheEncryptionKey()) {
+        core.info('Not restoring configuration-cache state, as Gradle User Home was not fully restored')
-            this.markNotRestored(listener, 'Encryption Key was not provided')
+        for (const cacheEntry of this.loadExtractedCacheEntries()) {
-            return
+            listener.entry(cacheEntry.pattern).markRequested('NOT_RESTORED')
         }
-
-        return await super.restore(listener)
-    }
-
-    private markNotRestored(listener: CacheListener, reason: string): void {
-        const cacheEntries = this.loadExtractedCacheEntries()
-        if (cacheEntries.length > 0) {
-            core.info(`Not restoring configuration-cache state, as ${reason}`)
-            for (const cacheEntry of cacheEntries) {
-                listener.entry(cacheEntry.pattern).markNotRestored(reason)
-            }
-
-            // Update the results file based on no entries restored
-            this.saveMetadataForCacheResults([])
-        }
-    }
-
-    async extract(listener: CacheListener): Promise<void> {
-        if (!params.getCacheEncryptionKey()) {
-            const cacheEntryDefinitions = this.getExtractedCacheEntryDefinitions()
-            if (cacheEntryDefinitions.length > 0) {
-                core.info('Not saving configuration-cache state, as no encryption key was provided')
-                for (const cacheEntry of cacheEntryDefinitions) {
-                    listener.entry(cacheEntry.pattern).markNotSaved('No encryption key provided')
-                }
-            }
-            return
-        }
-
-        await super.extract(listener)
     }
 
     /**
      * Extract cache entries for the configuration cache in each project.
      */
     protected getExtractedCacheEntryDefinitions(): ExtractedCacheEntryDefinition[] {
-        // Group BuildResult by existing configCacheDir
+        return this.getProjectRoots().map(projectRoot => {
-        const groupedResults = this.getConfigCacheDirectoriesWithAssociatedBuildResults()
+            const configCachePath = path.resolve(projectRoot, '.gradle/configuration-cache')
-
+            return new ExtractedCacheEntryDefinition(
-        return Object.entries(groupedResults).map(([configCachePath, pathResults]) => {
-            // Create a entry definition for each unique configuration cache directory
-            const definition = new ExtractedCacheEntryDefinition(
                 'configuration-cache',
                 configCachePath,
                 true
             ).withNonUniqueFileNames()
-
-            // If any associated build result used Gradle < 8.6, then mark it as not cacheable
-            if (
-                pathResults.find(result => {
-                    const gradleVersion = semver.coerce(result.gradleVersion)
-                    return gradleVersion && semver.lt(gradleVersion, '8.6.0')
-                })
-            ) {
-                core.info(
-                    `Not saving config-cache data for ${configCachePath}. Configuration cache data is only saved for Gradle 8.6+`
-                )
-                definition.notCacheableBecause('Configuration cache data only saved for Gradle 8.6+')
-            }
-            return definition
         })
     }
 
-    private getConfigCacheDirectoriesWithAssociatedBuildResults(): Record<string, BuildResult[]> {
+    /**
-        return loadBuildResults().reduce(
+     * For every Gradle invocation, we record the project root directory. This method returns the entire
-            (acc, buildResult) => {
+     * set of project roots, to allow saving of configuration-cache entries for each.
-                // For each build result, find the config-cache dir
+     */
-                const configCachePath = path.resolve(buildResult.rootProjectDir, '.gradle/configuration-cache')
+    private getProjectRoots(): string[] {
-                // Ignore case where config-cache dir doesn't exist
+        const buildResults = loadBuildResults()
-                if (!fs.existsSync(configCachePath)) {
+        const projectRootDirs = buildResults.map(x => x.rootProjectDir)
-                    return acc
+        return [...new Set(projectRootDirs)] // Remove duplicates
-                }
-
-                // Group by unique config cache directories and collect associated build results
-                if (!acc[configCachePath]) {
-                    acc[configCachePath] = []
-                }
-                acc[configCachePath].push(buildResult)
-                return acc
-            },
-            {} as Record<string, BuildResult[]>
-        )
     }
 }

src/cache-reporting.ts

@@ -1,3 +1,4 @@
+import * as core from '@actions/core'
 import * as cache from '@actions/cache'
 
 /**
@@ -111,36 +112,47 @@ export class CacheEntryListener {
     }
 }
 
-export function generateCachingReport(listener: CacheListener): string {
+export function writeCachingReport(listener: CacheListener): void {
     const entries = listener.cacheEntries
 
-    return `
+    core.summary.addRaw(
-<details>
+        `\n<details><summary><h4>Caching for gradle-build-action was ${listener.cacheStatus} - expand for details</h4></summary>\n`
-<summary><h4>Caching for gradle-build-action was ${listener.cacheStatus} - expand for details</h4></summary>
+    )
-${renderEntryTable(entries)}
 
-<h5>Cache Entry Details</h5>
+    core.summary.addTable([
-<pre>
+        [
-    ${renderEntryDetails(listener)}
+            {data: '', header: true},
+            {data: 'Count', header: true},
+            {data: 'Total Size (Mb)', header: true}
+        ],
+        ['Entries Restored', `${getCount(entries, e => e.restoredSize)}`, `${getSize(entries, e => e.restoredSize)}`],
+        ['Entries Saved', `${getCount(entries, e => e.savedSize)}`, `${getSize(entries, e => e.savedSize)}`]
+    ])
+
+    core.summary.addHeading('Cache Entry Details', 5)
+
+    const entryDetails = renderEntryDetails(listener)
+    core.summary.addRaw(`<pre>
+${entryDetails}
 </pre>
 </details>
-    `
+`)
 }
 
-function renderEntryTable(entries: CacheEntryListener[]): string {
+export function logCachingReport(listener: CacheListener): void {
-    return `
+    const entries = listener.cacheEntries
-<table>
+
-    <tr><td></td><th>Count</th><th>Total Size (Mb)</th></tr>
+    core.startGroup(`Caching for gradle-build-action was ${listener.cacheStatus} - expand for details`)
-    <tr><td>Entries Restored</td>
+
-        <td>${getCount(entries, e => e.restoredSize)}</td>
+    core.info(
-        <td>${getSize(entries, e => e.restoredSize)}</td>
+        `Entries Restored: ${getCount(entries, e => e.restoredSize)} (${getSize(entries, e => e.restoredSize)} Mb)`
-    </tr>
+    )
-    <tr><td>Entries Saved</td>
+    core.info(`Entries Saved   : ${getCount(entries, e => e.savedSize)} (${getSize(entries, e => e.savedSize)} Mb)`)
-        <td>${getCount(entries, e => e.savedSize)}</td>
+
-        <td>${getSize(entries, e => e.savedSize)}</td>
+    core.info(`Cache Entry Details`)
-    </tr>
+    core.info(renderEntryDetails(listener))
-</table>
+
-    `
+    core.endGroup()
 }
 
 function renderEntryDetails(listener: CacheListener): string {
@@ -186,9 +198,6 @@ function getSavedMessage(entry: CacheEntryListener, cacheReadOnly: boolean): str
         if (cacheReadOnly) {
             return '(Entry not saved: cache is read-only)'
         }
-        if (entry.notRestored) {
-            return '(Entry not saved: not restored)'
-        }
         return '(Entry not saved: reason unknown)'
     }
     if (entry.savedSize === 0) {

src/cache-utils.ts

@@ -11,7 +11,7 @@ import * as params from './input-params'
 
 import {CacheEntryListener} from './cache-reporting'
 
-const CACHE_PROTOCOL_VERSION = 'v9-'
+const CACHE_PROTOCOL_VERSION = 'v8-'
 
 const CACHE_KEY_PREFIX_VAR = 'GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX'
 const CACHE_KEY_OS_VAR = 'GRADLE_BUILD_ACTION_CACHE_KEY_ENVIRONMENT'
@@ -86,10 +86,10 @@ export function generateCacheKey(cacheName: string): CacheKey {
     // At the most general level, share caches for all executions on the same OS
     const cacheKeyForEnvironment = `${cacheKeyBase}|${getCacheKeyEnvironment()}`
 
-    // Then prefer caches that run job with the same ID
+    // Prefer caches that run this job
     const cacheKeyForJob = `${cacheKeyForEnvironment}|${getCacheKeyJob()}`
 
-    // Prefer (even more) jobs that run this job in the same workflow with the same context (matrix)
+    // Prefer (even more) jobs that run this job with the same context (matrix)
     const cacheKeyForJobContext = `${cacheKeyForJob}[${getCacheKeyJobInstance()}]`
 
     // Exact match on Git SHA
@@ -113,7 +113,12 @@ function getCacheKeyEnvironment(): string {
 }
 
 function getCacheKeyJob(): string {
-    return process.env[CACHE_KEY_JOB_VAR] || github.context.job
+    return process.env[CACHE_KEY_JOB_VAR] || getCacheKeyForJob(github.context.workflow, github.context.job)
+}
+
+export function getCacheKeyForJob(workflowName: string, jobId: string): string {
+    const sanitizedWorkflow = workflowName.replace(/,/g, '').toLowerCase()
+    return `${sanitizedWorkflow}-${jobId}`
 }
 
 function getCacheKeyJobInstance(): string {
@@ -122,11 +127,25 @@ function getCacheKeyJobInstance(): string {
         return override
     }
 
-    // By default, we hash the workflow name and the full `matrix` data for the run, to uniquely identify this job invocation
+    // By default, we hash the full `matrix` data for the run, to uniquely identify this job invocation
     // The only way we can obtain the `matrix` data is via the `workflow-job-context` parameter in action.yml.
-    const workflowName = github.context.workflow
     const workflowJobContext = params.getJobMatrix()
-    return hashStrings([workflowName, workflowJobContext])
+    return hashStrings([workflowJobContext])
+}
+
+export function getUniqueLabelForJobInstance(): string {
+    return getUniqueLabelForJobInstanceValues(github.context.workflow, github.context.job, params.getJobMatrix())
+}
+
+export function getUniqueLabelForJobInstanceValues(workflow: string, jobId: string, matrixJson: string): string {
+    const matrix = JSON.parse(matrixJson)
+    const matrixString = Object.values(matrix).join('-')
+    const label = matrixString ? `${workflow}-${jobId}-${matrixString}` : `${workflow}-${jobId}`
+    return sanitize(label)
+}
+
+function sanitize(value: string): string {
+    return value.replace(/[^a-zA-Z0-9_-]/g, '').toLowerCase()
 }
 
 function getCacheKeyJobExecution(): string {

src/caches.ts

@@ -13,7 +13,7 @@ import {CacheCleaner} from './cache-cleaner'
 
 const CACHE_RESTORED_VAR = 'GRADLE_BUILD_ACTION_CACHE_RESTORED'
 
-export async function restore(userHome: string, gradleUserHome: string, cacheListener: CacheListener): Promise<void> {
+export async function restore(gradleUserHome: string, cacheListener: CacheListener): Promise<void> {
     // Bypass restore cache on all but first action step in workflow.
     if (process.env[CACHE_RESTORED_VAR]) {
         core.info('Cache only restored on first action step.')
@@ -21,7 +21,7 @@ export async function restore(userHome: string, gradleUserHome: string, cacheLis
     }
     core.exportVariable(CACHE_RESTORED_VAR, true)
 
-    const gradleStateCache = new GradleStateCache(userHome, gradleUserHome)
+    const gradleStateCache = new GradleStateCache(gradleUserHome)
 
     if (isCacheDisabled()) {
         core.info('Cache is disabled: will not restore state from previous builds.')
@@ -65,7 +65,6 @@ export async function restore(userHome: string, gradleUserHome: string, cacheLis
 }
 
 export async function save(
-    userHome: string,
     gradleUserHome: string,
     cacheListener: CacheListener,
     daemonController: DaemonController
@@ -99,6 +98,6 @@ export async function save(
     }
 
     await core.group('Caching Gradle state', async () => {
-        return new GradleStateCache(userHome, gradleUserHome).save(cacheListener)
+        return new GradleStateCache(gradleUserHome).save(cacheListener)
     })
 }

src/dependency-graph.ts

@@ -1,7 +1,8 @@
 import * as core from '@actions/core'
+import * as artifact from '@actions/artifact'
 import * as github from '@actions/github'
 import * as glob from '@actions/glob'
-import {DefaultArtifactClient} from '@actions/artifact'
+import * as toolCache from '@actions/tool-cache'
 import {GitHub} from '@actions/github/lib/utils'
 import {RequestError} from '@octokit/request-error'
 import type {PullRequestEvent} from '@octokit/webhooks-types'
@@ -12,7 +13,7 @@ import fs from 'fs'
 import * as layout from './repository-layout'
 import {DependencyGraphOption, getJobMatrix, getArtifactRetentionDays} from './input-params'
 
-const DEPENDENCY_GRAPH_PREFIX = 'dependency-graph_'
+const DEPENDENCY_GRAPH_ARTIFACT = 'dependency-graph'
 
 export async function setup(option: DependencyGraphOption): Promise<void> {
     if (option === DependencyGraphOption.Disabled) {
@@ -35,51 +36,47 @@ export async function setup(option: DependencyGraphOption): Promise<void> {
         'DEPENDENCY_GRAPH_REPORT_DIR',
         path.resolve(layout.workspaceDirectory(), 'dependency-graph-reports')
     )
+
+    // To clear the dependency graph, we generate an empty graph by excluding all projects and configurations
+    if (option === DependencyGraphOption.Clear) {
+        core.exportVariable('DEPENDENCY_GRAPH_INCLUDE_PROJECTS', '')
+        core.exportVariable('DEPENDENCY_GRAPH_INCLUDE_CONFIGURATIONS', '')
+    }
 }
 
 export async function complete(option: DependencyGraphOption): Promise<void> {
-    try {
     switch (option) {
         case DependencyGraphOption.Disabled:
-            case DependencyGraphOption.Generate: // Performed via init-script: nothing to do here
         case DependencyGraphOption.DownloadAndSubmit: // Performed in setup
             return
-            case DependencyGraphOption.GenerateAndSubmit:
+        case DependencyGraphOption.Generate:
-                await submitDependencyGraphs(await findGeneratedDependencyGraphFiles())
+            await uploadDependencyGraphs()
+            return
+        case DependencyGraphOption.GenerateAndSubmit:
+        case DependencyGraphOption.Clear: // Submit the empty dependency graph
+            await submitDependencyGraphs(await uploadDependencyGraphs())
             return
-            case DependencyGraphOption.GenerateAndUpload:
-                await uploadDependencyGraphs(await findGeneratedDependencyGraphFiles())
-        }
-    } catch (e) {
-        core.warning(`Failed to ${option} dependency graph. Will continue. ${String(e)}`)
     }
 }
 
-async function findGeneratedDependencyGraphFiles(): Promise<string[]> {
+async function uploadDependencyGraphs(): Promise<string[]> {
     const workspaceDirectory = layout.workspaceDirectory()
-    return await findDependencyGraphFiles(workspaceDirectory)
+    const graphFiles = await findDependencyGraphFiles(workspaceDirectory)
-}
 
-async function uploadDependencyGraphs(dependencyGraphFiles: string[]): Promise<void> {
+    const relativeGraphFiles = graphFiles.map(x => getRelativePathFromWorkspace(x))
-    const workspaceDirectory = layout.workspaceDirectory()
+    core.info(`Uploading dependency graph files: ${relativeGraphFiles}`)
 
-    const artifactClient = new DefaultArtifactClient()
+    const artifactClient = artifact.create()
-    for (const dependencyGraphFile of dependencyGraphFiles) {
+    artifactClient.uploadArtifact(DEPENDENCY_GRAPH_ARTIFACT, graphFiles, workspaceDirectory, {
-        const relativePath = getRelativePathFromWorkspace(dependencyGraphFile)
-        core.info(`Uploading dependency graph file: ${relativePath}`)
-        const artifactName = `${DEPENDENCY_GRAPH_PREFIX}${path.basename(dependencyGraphFile)}`
-        await artifactClient.uploadArtifact(artifactName, [dependencyGraphFile], workspaceDirectory, {
         retentionDays: getArtifactRetentionDays()
     })
-    }
+
+    return graphFiles
 }
 
 async function downloadAndSubmitDependencyGraphs(): Promise<void> {
-    try {
+    const workspaceDirectory = layout.workspaceDirectory()
-        await submitDependencyGraphs(await downloadDependencyGraphs())
+    submitDependencyGraphs(await retrieveDependencyGraphs(workspaceDirectory))
-    } catch (e) {
-        core.warning(`Download and submit dependency graph failed. Will continue. ${String(e)}`)
-    }
 }
 
 async function submitDependencyGraphs(dependencyGraphFiles: string[]): Promise<void> {
@@ -121,37 +118,56 @@ async function submitDependencyGraphFile(jsonFile: string): Promise<void> {
     core.notice(`Submitted ${relativeJsonFile}: ${response.data.message}`)
 }
 
-async function downloadDependencyGraphs(): Promise<string[]> {
+async function retrieveDependencyGraphs(workspaceDirectory: string): Promise<string[]> {
-    const workspaceDirectory = layout.workspaceDirectory()
+    if (github.context.payload.workflow_run) {
-
+        return await retrieveDependencyGraphsForWorkflowRun(github.context.payload.workflow_run.id, workspaceDirectory)
-    const findBy = github.context.payload.workflow_run
-        ? {
-              token: getGithubToken(),
-              workflowRunId: github.context.payload.workflow_run.id,
-              repositoryName: github.context.repo.repo,
-              repositoryOwner: github.context.repo.owner
     }
-        : undefined
+    return retrieveDependencyGraphsForCurrentWorkflow(workspaceDirectory)
+}
 
-    const artifactClient = new DefaultArtifactClient()
+async function retrieveDependencyGraphsForWorkflowRun(runId: number, workspaceDirectory: string): Promise<string[]> {
+    const octokit = getOctokit()
+
+    // Find the workflow run artifacts named "dependency-graph"
+    const artifacts = await octokit.rest.actions.listWorkflowRunArtifacts({
+        owner: github.context.repo.owner,
+        repo: github.context.repo.repo,
+        run_id: runId
+    })
+
+    const matchArtifact = artifacts.data.artifacts.find(candidate => {
+        return candidate.name === DEPENDENCY_GRAPH_ARTIFACT
+    })
+
+    if (matchArtifact === undefined) {
+        throw new Error(`Dependency graph artifact not found. Has it been generated by workflow run '${runId}'?`)
+    }
+
+    // Download the dependency-graph artifact
+    const download = await octokit.rest.actions.downloadArtifact({
+        owner: github.context.repo.owner,
+        repo: github.context.repo.repo,
+        artifact_id: matchArtifact.id,
+        archive_format: 'zip'
+    })
+
+    const downloadBuffer = download.data as ArrayBuffer
+    const downloadZip = path.resolve(workspaceDirectory, 'dependency-graph.zip')
+    fs.writeFileSync(downloadZip, Buffer.from(downloadBuffer))
+
+    // Expance the dependency-graph zip and locate each dependency-graph JSON file
+    const extractDir = path.resolve(workspaceDirectory, 'dependency-graph')
+    const extracted = await toolCache.extractZip(downloadZip, extractDir)
+    core.info(`Extracted dependency graph artifacts to ${extracted}: ${fs.readdirSync(extracted)}`)
+
+    return findDependencyGraphFiles(extracted)
+}
+
+async function retrieveDependencyGraphsForCurrentWorkflow(workspaceDirectory: string): Promise<string[]> {
+    const artifactClient = artifact.create()
     const downloadPath = path.resolve(workspaceDirectory, 'dependency-graph')
-
+    await artifactClient.downloadArtifact(DEPENDENCY_GRAPH_ARTIFACT, downloadPath)
-    const dependencyGraphArtifacts = (
+    return await findDependencyGraphFiles(downloadPath)
-        await artifactClient.listArtifacts({
-            latest: true,
-            findBy
-        })
-    ).artifacts.filter(candidate => candidate.name.startsWith(DEPENDENCY_GRAPH_PREFIX))
-
-    for (const artifact of dependencyGraphArtifacts) {
-        const downloadedArtifact = await artifactClient.downloadArtifact(artifact.id, {
-            path: downloadPath,
-            findBy
-        })
-        core.info(`Downloading dependency-graph artifact ${artifact.name} to ${downloadedArtifact.downloadPath}`)
-    }
-
-    return findDependencyGraphFiles(downloadPath)
 }
 
 async function findDependencyGraphFiles(dir: string): Promise<string[]> {

src/input-params.ts

@@ -29,10 +29,6 @@ export function isCacheCleanupEnabled(): boolean {
     return getBooleanInput('gradle-home-cache-cleanup')
 }
 
-export function getCacheEncryptionKey(): string {
-    return core.getInput('cache-encryption-key')
-}
-
 export function getCacheIncludes(): string[] {
     return core.getMultilineInput('gradle-home-cache-includes')
 }
@@ -71,25 +67,8 @@ export function isJobSummaryEnabled(): boolean {
     return getBooleanInput('generate-job-summary', true)
 }
 
-export function getJobSummaryOption(): JobSummaryOption {
+export function isDependencyGraphEnabled(): boolean {
-    return parseJobSummaryOption('add-job-summary')
+    return getBooleanInput('generate-dependency-graph', true)
-}
-
-export function getPRCommentOption(): JobSummaryOption {
-    return parseJobSummaryOption('add-job-summary-as-pr-comment')
-}
-
-function parseJobSummaryOption(paramName: string): JobSummaryOption {
-    const val = core.getInput(paramName)
-    switch (val.toLowerCase().trim()) {
-        case 'never':
-            return JobSummaryOption.Never
-        case 'always':
-            return JobSummaryOption.Always
-        case 'on-failure':
-            return JobSummaryOption.OnFailure
-    }
-    throw TypeError(`The value '${val}' is not valid for ${paramName}. Valid values are: [never, always, on-failure].`)
 }
 
 export function getDependencyGraphOption(): DependencyGraphOption {
@@ -101,13 +80,13 @@ export function getDependencyGraphOption(): DependencyGraphOption {
             return DependencyGraphOption.Generate
         case 'generate-and-submit':
             return DependencyGraphOption.GenerateAndSubmit
-        case 'generate-and-upload':
-            return DependencyGraphOption.GenerateAndUpload
         case 'download-and-submit':
             return DependencyGraphOption.DownloadAndSubmit
+        case 'clear':
+            return DependencyGraphOption.Clear
     }
     throw TypeError(
-        `The value '${val}' is not valid for 'dependency-graph'. Valid values are: [disabled, generate, generate-and-submit, generate-and-upload, download-and-submit]. The default value is 'disabled'.`
+        `The value '${val} is not valid for 'dependency-graph. Valid values are: [disabled, generate-and-upload, generate-and-submit, download-and-submit]. The default value is 'disabled'.`
     )
 }
 
@@ -142,15 +121,9 @@ function getBooleanInput(paramName: string, paramDefault = false): boolean {
 }
 
 export enum DependencyGraphOption {
-    Disabled = 'disabled',
+    Disabled,
-    Generate = 'generate',
+    Generate,
-    GenerateAndSubmit = 'generate-and-submit',
+    GenerateAndSubmit,
-    GenerateAndUpload = 'generate-and-upload',
+    DownloadAndSubmit,
-    DownloadAndSubmit = 'download-and-submit'
+    Clear
-}
-
-export enum JobSummaryOption {
-    Never = 'never',
-    Always = 'always',
-    OnFailure = 'on-failure'
 }

src/job-summary.ts

@@ -1,94 +1,45 @@
 import * as core from '@actions/core'
-import * as github from '@actions/github'
-import {SUMMARY_ENV_VAR} from '@actions/core/lib/summary'
-import {RequestError} from '@octokit/request-error'
-
-import * as params from './input-params'
 import {BuildResult} from './build-results'
-import {CacheListener, generateCachingReport} from './cache-reporting'
+import {writeCachingReport, CacheListener, logCachingReport} from './cache-reporting'
 
-export async function generateJobSummary(buildResults: BuildResult[], cacheListener: CacheListener): Promise<void> {
+export async function writeJobSummary(buildResults: BuildResult[], cacheListener: CacheListener): Promise<void> {
-    const summaryTable = renderSummaryTable(buildResults)
+    core.info('Writing job summary')
-    const cachingReport = generateCachingReport(cacheListener)
 
-    if (shouldGenerateJobSummary(buildResults)) {
+    if (buildResults.length === 0) {
-        core.info('Generating Job Summary')
+        core.debug('No Gradle build results found. Summary table will not be generated.')
+    } else {
+        writeSummaryTable(buildResults)
+    }
+
+    writeCachingReport(cacheListener)
 
-        core.summary.addRaw(summaryTable)
-        core.summary.addRaw(cachingReport)
     await core.summary.write()
+}
+
+export async function logJobSummary(buildResults: BuildResult[], cacheListener: CacheListener): Promise<void> {
+    if (buildResults.length === 0) {
+        core.debug('No Gradle build results found. Summary table will not be logged.')
     } else {
-        core.info('============================')
+        logSummaryTable(buildResults)
-        core.info(summaryTable)
-        core.info('============================')
-        core.info(cachingReport)
-        core.info('============================')
     }
 
-    if (shouldAddPRComment(buildResults)) {
+    logCachingReport(cacheListener)
-        await addPRComment(summaryTable)
-    }
 }
 
-async function addPRComment(jobSummary: string): Promise<void> {
+function writeSummaryTable(results: BuildResult[]): void {
-    const context = github.context
+    core.summary.addHeading('Gradle Builds', 3)
-    if (context.payload.pull_request == null) {
-        core.info('No pull_request trigger: not adding PR comment')
-        return
-    }
 
-    const pull_request_number = context.payload.pull_request.number
+    core.summary.addRaw(`
-    core.info(`Adding Job Summary as comment to PR #${pull_request_number}.`)
-
-    const prComment = `<h3>Job Summary for gradle-build-action</h3>
-<h5>${github.context.workflow} :: <em>${github.context.job}</em></h5>
-
-${jobSummary}`
-
-    const github_token = params.getGithubToken()
-    const octokit = github.getOctokit(github_token)
-    try {
-        await octokit.rest.issues.createComment({
-            ...context.repo,
-            issue_number: pull_request_number,
-            body: prComment
-        })
-    } catch (error) {
-        if (error instanceof RequestError) {
-            core.warning(buildWarningMessage(error))
-        } else {
-            throw error
-        }
-    }
-}
-
-function buildWarningMessage(error: RequestError): string {
-    const mainWarning = `Failed to generate PR comment.\n${String(error)}`
-    if (error.message === 'Resource not accessible by integration') {
-        return `${mainWarning}
-Please ensure that the 'pull-requests: write' permission is available for the workflow job.
-Note that this permission is never available for a workflow triggered from a repository fork.
-        `
-    }
-    return mainWarning
-}
-
-function renderSummaryTable(results: BuildResult[]): string {
-    if (results.length === 0) {
-        return 'No Gradle build results detected.'
-    }
-
-    return `
 <table>
     <tr>
-        <th>Gradle Root Project</th>
+        <th>Root Project</th>
         <th>Requested Tasks</th>
         <th>Gradle Version</th>
         <th>Build Outcome</th>
         <th>Build Scan®</th>
     </tr>${results.map(result => renderBuildResultRow(result)).join('')}
 </table>
-    `
+    `)
 }
 
 function renderBuildResultRow(result: BuildResult): string {
@@ -126,32 +77,18 @@ function renderBuildScanBadge(outcomeText: string, outcomeColor: string, targetU
     return `<a href="${targetUrl}" rel="nofollow">${badgeHtml}</a>`
 }
 
-function shouldGenerateJobSummary(buildResults: BuildResult[]): boolean {
+function logSummaryTable(results: BuildResult[]): void {
-    // Check if Job Summary is supported on this platform
+    core.info('============================')
-    if (!process.env[SUMMARY_ENV_VAR]) {
+    core.info('Gradle Builds')
-        return false
+    core.info('----------------------------')
-    }
+    core.info('Root Project | Requested Tasks | Gradle Version | Build Outcome | Build Scan®')
-
+    core.info('----------------------------')
-    // Check if Job Summary is disabled using the deprecated input
+    for (const result of results) {
-    if (!params.isJobSummaryEnabled()) {
+        core.info(
-        return false
+            `${result.rootProjectName} | ${result.requestedTasks} | ${result.gradleVersion} | ${
-    }
+                result.buildFailed ? 'FAILED' : 'SUCCESS'
-
+            } | ${result.buildScanFailed ? 'Publish failed' : result.buildScanUri}`
-    return shouldAddJobSummary(params.getJobSummaryOption(), buildResults)
+        )
-}
-
-function shouldAddPRComment(buildResults: BuildResult[]): boolean {
-    return shouldAddJobSummary(params.getPRCommentOption(), buildResults)
-}
-
-function shouldAddJobSummary(option: params.JobSummaryOption, buildResults: BuildResult[]): boolean {
-    switch (option) {
-        case params.JobSummaryOption.Always:
-            return true
-        case params.JobSummaryOption.Never:
-            return false
-        case params.JobSummaryOption.OnFailure:
-            core.info(`Got these build results: ${JSON.stringify(buildResults)}`)
-            return buildResults.some(result => result.buildFailed)
     }
+    core.info('============================')
 }

src/resources/init-scripts/gradle-build-action.github-dependency-graph.init.gradle

@@ -27,6 +27,7 @@ if (isTopLevelBuild) {
       new File(githubOutput) << "dependency-graph-file=${reportFile.absolutePath}\n"
   }
 
+
   println "Generating dependency graph into '${reportFile}'"
 }
 

src/resources/toolchains.xml

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<toolchains>
-  <!-- JDK Toolchains installed by default on GitHub-hosted runners -->
-  <toolchain>
-    <type>jdk</type>
-    <provides>
-      <version>8</version>
-      <vendor>Eclipse Temurin</vendor>
-    </provides>
-    <configuration>
-      <jdkHome>${env.JAVA_HOME_8_X64}</jdkHome>
-    </configuration>
-  </toolchain>
-  <toolchain>
-    <type>jdk</type>
-    <provides>
-      <version>11</version>
-      <vendor>Eclipse Temurin</vendor>
-    </provides>
-    <configuration>
-      <jdkHome>${env.JAVA_HOME_11_X64}</jdkHome>
-    </configuration>
-  </toolchain>
-  <toolchain>
-    <type>jdk</type>
-    <provides>
-      <version>17</version>
-      <vendor>Eclipse Temurin</vendor>
-    </provides>
-    <configuration>
-      <jdkHome>${env.JAVA_HOME_17_X64}</jdkHome>
-    </configuration>
-  </toolchain>
-  <toolchain>
-    <type>jdk</type>
-    <provides>
-      <version>21</version>
-      <vendor>Eclipse Temurin</vendor>
-    </provides>
-    <configuration>
-      <jdkHome>${env.JAVA_HOME_21_X64}</jdkHome>
-    </configuration>
-  </toolchain>
-</toolchains>

src/setup-gradle.ts

@@ -1,24 +1,23 @@
 import * as core from '@actions/core'
 import * as exec from '@actions/exec'
+import {SUMMARY_ENV_VAR} from '@actions/core/lib/summary'
 import * as path from 'path'
 import * as os from 'os'
 import * as caches from './caches'
 import * as layout from './repository-layout'
 import * as params from './input-params'
 import * as dependencyGraph from './dependency-graph'
-import * as jobSummary from './job-summary'
 
+import {logJobSummary, writeJobSummary} from './job-summary'
 import {loadBuildResults} from './build-results'
 import {CacheListener} from './cache-reporting'
 import {DaemonController} from './daemon-controller'
 
 const GRADLE_SETUP_VAR = 'GRADLE_BUILD_ACTION_SETUP_COMPLETED'
-const USER_HOME = 'USER_HOME'
 const GRADLE_USER_HOME = 'GRADLE_USER_HOME'
 const CACHE_LISTENER = 'CACHE_LISTENER'
 
 export async function setup(): Promise<void> {
-    const userHome = await determineUserHome()
     const gradleUserHome = await determineGradleUserHome()
 
     // Bypass setup on all but first action step in workflow.
@@ -31,12 +30,11 @@ export async function setup(): Promise<void> {
     // Record setup complete: visible in post-action, to control action completion
     core.saveState(GRADLE_SETUP_VAR, true)
 
-    // Save the User Home and Gradle User Home for use in the post-action step.
+    // Save the Gradle User Home for use in the post-action step.
-    core.saveState(USER_HOME, userHome)
     core.saveState(GRADLE_USER_HOME, gradleUserHome)
 
     const cacheListener = new CacheListener()
-    await caches.restore(userHome, gradleUserHome, cacheListener)
+    await caches.restore(gradleUserHome, cacheListener)
 
     core.saveState(CACHE_LISTENER, cacheListener.stringify())
 
@@ -48,22 +46,23 @@ 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 post-action step')
+    core.info('In final post-action step, saving state and writing summary')
 
     const buildResults = loadBuildResults()
 
-    const userHome = core.getState(USER_HOME)
     const gradleUserHome = core.getState(GRADLE_USER_HOME)
     const cacheListener: CacheListener = CacheListener.rehydrate(core.getState(CACHE_LISTENER))
     const daemonController = new DaemonController(buildResults)
 
-    await caches.save(userHome, gradleUserHome, cacheListener, daemonController)
+    await caches.save(gradleUserHome, cacheListener, daemonController)
 
-    await jobSummary.generateJobSummary(buildResults, cacheListener)
+    if (shouldGenerateJobSummary()) {
+        await writeJobSummary(buildResults, cacheListener)
+    } else {
+        logJobSummary(buildResults, cacheListener)
+    }
 
     await dependencyGraph.complete(params.getDependencyGraphOption())
-
-    core.info('Completed post-action step')
 }
 
 async function determineGradleUserHome(): Promise<string> {
@@ -92,3 +91,12 @@ async function determineUserHome(): Promise<string> {
     core.debug(`Determined user.home from java -version output: '${userHome}'`)
     return userHome
 }
+
+function shouldGenerateJobSummary(): boolean {
+    // Check if Job Summary is supported on this platform
+    if (!process.env[SUMMARY_ENV_VAR]) {
+        return false
+    }
+
+    return params.isJobSummaryEnabled()
+}

test/init-scripts/settings.gradle

@@ -1,6 +1,6 @@
 plugins {
-    id "com.gradle.enterprise" version "3.16.1"
+    id "com.gradle.enterprise" version "3.15.1"
-    id "com.gradle.common-custom-user-data-gradle-plugin" version "1.12.1"
+    id "com.gradle.common-custom-user-data-gradle-plugin" version "1.12"
 }
 
 gradleEnterprise {

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

@@ -16,8 +16,8 @@ import java.nio.file.Files
 import java.util.zip.GZIPOutputStream
 
 class BaseInitScriptTest extends Specification {
-    static final String GE_PLUGIN_VERSION = '3.16.1'
+    static final String GE_PLUGIN_VERSION = '3.15.1'
-    static final String CCUD_PLUGIN_VERSION = '1.12.1'
+    static final String CCUD_PLUGIN_VERSION = '1.12'
 
     static final TestGradleVersion GRADLE_3_X = new TestGradleVersion(GradleVersion.version('3.5.1'), 7, 9)
     static final TestGradleVersion GRADLE_4_X = new TestGradleVersion(GradleVersion.version('4.10.3'), 7, 10)

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

@@ -171,7 +171,7 @@ class TestBuildResultRecorder extends BaseInitScriptTest {
         when:
         settingsFile.text = """
             plugins {
-                id 'com.gradle.enterprise' version '3.16.1' apply(false)
+                id 'com.gradle.enterprise' version '3.15.1' apply(false)
             }
             gradle.settingsEvaluated {
                 apply plugin: 'com.gradle.enterprise'

test/jest/cache-utils.test.ts

@@ -17,4 +17,10 @@ describe('cacheUtils-utils', () => {
             expect(posixHash).toBe(windowsHash)
         })
     })
+    describe('sanitizes workflow name in cache key', () => {
+        it('with comma', () => {
+            const cacheKey = cacheUtils.getCacheKeyForJob("Workflow, with,commas", "JOB_ID")
+            expect(cacheKey).toBe('workflow withcommas-JOB_ID')
+        })
+    })
 })