actions/gradle
1
0
Fork 0
mirror of https://github.com/gradle/actions.git synced 2025-08-23 18:31:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use settingsEvaluated in preference to projectsEvaluated in init-script

Browse Source
This commit is contained in:
daz 2024-07-18 13:38:19 -06:00
parent b7e399239c
commit 6d20c16462
No known key found for this signature in database
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sources/src/resources/init-scripts/gradle-actions.build-result-capture-service.plugin.groovy
View File

@ -2,12 +2,10 @@ import org.gradle.tooling.events.*
import org.gradle.tooling.events.task.* import org.gradle.tooling.events.task.*
import org.gradle.util.GradleVersion import org.gradle.util.GradleVersion
// Can't use settingsEvaluated since this script is applied inside a settingsEvaluated handler settingsEvaluated { settings ->
// But projectsEvaluated is good enough, since the build service won't catch configuration failures anyway
projectsEvaluated {
def projectTracker = gradle.sharedServices.registerIfAbsent("gradle-action-buildResultsRecorder", BuildResultsRecorder, { spec -> def projectTracker = gradle.sharedServices.registerIfAbsent("gradle-action-buildResultsRecorder", BuildResultsRecorder, { spec ->
spec.getParameters().getRootProjectName().set(gradle.rootProject.name) spec.getParameters().getRootProjectName().set(settings.rootProject.name)
spec.getParameters().getRootProjectDir().set(gradle.rootProject.rootDir.absolutePath) spec.getParameters().getRootProjectDir().set(settings.rootDir.absolutePath)
spec.getParameters().getRequestedTasks().set(gradle.startParameter.taskNames.join(" ")) spec.getParameters().getRequestedTasks().set(gradle.startParameter.taskNames.join(" "))
spec.getParameters().getGradleHomeDir().set(gradle.gradleHomeDir.absolutePath) spec.getParameters().getGradleHomeDir().set(gradle.gradleHomeDir.absolutePath)
spec.getParameters().getInvocationId().set(gradle.ext.invocationId) spec.getParameters().getInvocationId().set(gradle.ext.invocationId)

18
sources/src/resources/init-scripts/gradle-actions.build-result-capture.init.gradle
View File

@ -21,16 +21,16 @@ if (isTopLevelBuild) {
def invocationId = "-${System.currentTimeMillis()}" def invocationId = "-${System.currentTimeMillis()}"
if (atLeastGradle6) { if (atLeastGradle6) {
// By default, use standard mechanisms to capture build results
def useBuildService = version >= GradleVersion.version("6.6") def useBuildService = version >= GradleVersion.version("6.6")
if (useBuildService) {
captureUsingBuildService(invocationId)
} else {
captureUsingBuildFinished(gradle, invocationId)
}
// Use the Develocity plugin to also capture build scan links, when available
settingsEvaluated { settings -> settingsEvaluated { settings ->
// By default, use standard mechanisms to capture build results
if (useBuildService) {
captureUsingBuildService(settings, invocationId)
} else {
captureUsingBuildFinished(gradle, invocationId)
}
settings.pluginManager.withPlugin(GE_PLUGIN_ID) { settings.pluginManager.withPlugin(GE_PLUGIN_ID) {
// Only execute if develocity plugin isn't applied. // Only execute if develocity plugin isn't applied.
if (!settings.extensions.findByName(DEVELOCITY_EXTENSION)) { if (!settings.extensions.findByName(DEVELOCITY_EXTENSION)) {
@ -100,7 +100,7 @@ def captureUsingBuildFinished(gradle, invocationId) {
} }
} }
def captureUsingBuildService(settings, invocationId) { def captureUsingBuildService(invocationId) {
gradle.ext.invocationId = invocationId gradle.ext.invocationId = invocationId
apply from: 'gradle-actions.build-result-capture-service.plugin.groovy' apply from: 'gradle-actions.build-result-capture-service.plugin.groovy'
} }