diff --git a/.github/workflow-samples/groovy-dsl/build.gradle b/.github/workflow-samples/groovy-dsl/build.gradle index 010ba43f..a58481ab 100644 --- a/.github/workflow-samples/groovy-dsl/build.gradle +++ b/.github/workflow-samples/groovy-dsl/build.gradle @@ -11,8 +11,8 @@ dependencies { } tasks.named("test").configure { - // Echo an output value so we can detect configuration-cache usage - println "::set-output name=task_configured::yes" + // Write marker file so we can detect if task was configured + file("task-configured.txt").text = "true" doLast { if (System.properties.verifyCachedBuild) { diff --git a/.github/workflow-samples/kotlin-dsl/build.gradle.kts b/.github/workflow-samples/kotlin-dsl/build.gradle.kts index 45d42257..5685a43b 100644 --- a/.github/workflow-samples/kotlin-dsl/build.gradle.kts +++ b/.github/workflow-samples/kotlin-dsl/build.gradle.kts @@ -18,8 +18,8 @@ tasks.test { } tasks.named("test").configure { - // Echo an output value so we can detect configuration-cache usage - println("::set-output name=task_configured::yes") + // Write marker file so we can detect if task was configured + file("task-configured.txt").writeText("true") doLast { if (System.getProperties().containsKey("verifyCachedBuild")) { diff --git a/.github/workflows/integ-test-restore-configuration-cache.yml b/.github/workflows/integ-test-restore-configuration-cache.yml index 462a4649..bf014feb 100644 --- a/.github/workflows/integ-test-restore-configuration-cache.yml +++ b/.github/workflows/integ-test-restore-configuration-cache.yml @@ -60,11 +60,13 @@ jobs: working-directory: .github/workflow-samples/groovy-dsl run: ./gradlew test --configuration-cache - name: Check that configuration-cache was used - if: ${{ steps.execute.outputs.task_configured == 'yes' }} uses: actions/github-script@v6 with: script: | - core.setFailed('Configuration cache was not used - task was configured unexpectedly') + const fs = require('fs') + if (fs.existsSync('.github/workflow-samples/groovy-dsl/task-configured.txt')) { + core.setFailed('Configuration cache was not used - task was configured unexpectedly') + } # Check that the build can run when no extracted cache entries are restored gradle-user-home-not-fully-restored: @@ -154,9 +156,11 @@ jobs: working-directory: .github/workflow-samples/kotlin-dsl run: ./gradlew test --configuration-cache - name: Check that configuration-cache was used - if: ${{ steps.execute.outputs.task_configured == 'yes' }} uses: actions/github-script@v6 with: script: | - core.setFailed('Configuration cache was not used - task was configured unexpectedly') + const fs = require('fs') + if (fs.existsSync('.github/workflow-samples/kotlin-dsl/task-configured.txt')) { + core.setFailed('Configuration cache was not used - task was configured unexpectedly') + } diff --git a/src/resources/init-scripts/build-result-capture.init.gradle b/src/resources/init-scripts/build-result-capture.init.gradle index be42dda9..5f3d1fd1 100644 --- a/src/resources/init-scripts/build-result-capture.init.gradle +++ b/src/resources/init-scripts/build-result-capture.init.gradle @@ -51,7 +51,10 @@ def captureUsingBuildScanPublished(buildScanExtension, rootProject, invocationId buildResults.setBuildScanUri(buildScan.buildScanUri.toASCIIString()) buildResults.writeToResultsFile(true) - println("::set-output name=build-scan-url::${buildScan.buildScanUri}") + def githubOutput = System.getenv("GITHUB_OUTPUT") + if (githubOutput) { + new File(githubOutput) << "build-scan-url=${buildScan.buildScanUri}\n" + } } onError { error ->