Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -392,14 +392,6 @@ tasks {
}


if (hasProperty("buildScan")) {
extensions.findByName("buildScan")?.withGroovyBuilder {
setProperty("termsOfServiceUrl", "https://gradle.com/terms-of-service")
setProperty("termsOfServiceAgree", "yes")
}
}


tasks.register<org.jetbrains.intellij.platform.gradle.tasks.PublishPluginTask>("publishPluginStandalone") {
token.set(System.getenv("PUBLISH_TOKEN"))
// pluginVersion is based on the SemVer (https://semver.org) and supports pre-release labels, like 2.1.7-alpha.3
Expand Down
4 changes: 2 additions & 2 deletions ci/release.Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ pipeline {
sh("""
mkdir -p ./build
./generate-changelog > build/CHANGELOG
./gradlew --no-daemon -I ./build-cache-init.gradle.kts -I ./repo-cache-init.gradle.kts --build-cache build buildPlugin --scan
./gradlew --no-daemon -I ./build-cache-init.gradle.kts -I ./repo-cache-init.gradle.kts --build-cache build buildPlugin -PbuildScan
""")
script {
if (env.BRANCH_NAME ==~ /^([0-9][0-9][0-9]\.x)$/) {
Expand All @@ -378,7 +378,7 @@ pipeline {
"""
)
sh("""
./gradlew --no-daemon -I ./build-cache-init.gradle.kts --build-cache publishPluginStandalone --scan
./gradlew --no-daemon -I ./build-cache-init.gradle.kts --build-cache publishPluginStandalone -PbuildScan
""")
}
else {
Expand Down
23 changes: 23 additions & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1 +1,24 @@
plugins {
id("com.gradle.develocity") version "4.4.3"
}

rootProject.name = "systemdUnitFilePlugin"

// Build scans upload build + environment data to Gradle's public service and are
// governed by https://gradle.com/help/legal-terms-of-use . We therefore only
// accept the terms and publish a scan when explicitly opted in via -PbuildScan
// (e.g. from CI). Local and contributor builds neither accept the terms nor upload.
val buildScanOptIn = providers.gradleProperty("buildScan").isPresent

develocity {
buildScan {
termsOfUseUrl = "https://gradle.com/help/legal-terms-of-use"
// 'termsOfUseAgree' must be exactly "yes" or left unset - the plugin rejects "no".
// Only agree (and publish) when opted in; otherwise leave it unset so a stray
// --scan degrades to a soft "terms not agreed" notice rather than a hard error.
if (buildScanOptIn) {
termsOfUseAgree = "yes"
}
publishing.onlyIf { buildScanOptIn }
}
}
Loading