Skip to content

Commit d919ba7

Browse files
marcphilippmarcphilipp
committed
Namespace user-specific build parameters
1 parent e26cd83 commit d919ba7

File tree

5 files changed

+36
-32
lines changed

5 files changed

+36
-32
lines changed

‎.github/workflows/cross-version.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
- '*'
1111

1212
env:
13-
DEVELOCITY_TESTDISTRIBUTION_ENABLED: true
13+
JUNIT_DEVELOCITY_TESTDISTRIBUTION_ENABLED: true
1414
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
1515

1616
jobs:

‎.github/workflows/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
- '*'
1111

1212
env:
13-
DEVELOCITY_TESTDISTRIBUTION_ENABLED: true
13+
JUNIT_DEVELOCITY_TESTDISTRIBUTION_ENABLED: true
1414
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
1515

1616
jobs:

‎gradle/plugins/build-parameters/build.gradle.kts

+26-23
Original file line numberDiff line numberDiff line change
@@ -14,38 +14,41 @@ buildParameters {
1414
integer("javaToolchainVersion") {
1515
description = "Defines the Java toolchain version to use for compiling code"
1616
}
17-
group("buildCache") {
18-
string("server") {
19-
description = "Remote build cache server address (protocol and hostname), e.g. https://eu-build-cache-ge.junit.org"
20-
}
21-
}
2217
group("documentation") {
2318
description = "Parameters controlling how the documentation is built"
2419
bool("replaceCurrentDocs") {
2520
description = "The documentation that is being deployed will replace what's currently deployed as 'current'"
2621
defaultValue = false
2722
}
2823
}
29-
group("develocity") {
30-
description = "Parameters controlling Gradle Enterprise features"
31-
group("predictiveTestSelection") {
32-
bool("enabled") {
33-
description = "Whether or not to use Predictive Test Selection for selecting tests to execute"
34-
defaultValue = true
35-
}
36-
}
37-
group("testDistribution") {
38-
bool("enabled") {
39-
description = "Whether or not to use Test Distribution for executing tests"
40-
defaultValue = false
41-
fromEnvironment()
24+
group("junit") {
25+
group("develocity") {
26+
description = "Parameters controlling Develocity features"
27+
group("buildCache") {
28+
string("server") {
29+
description =
30+
"Remote build cache server address (protocol and hostname), e.g. https://eu-build-cache-ge.junit.org"
31+
}
4232
}
43-
integer("maxLocalExecutors") {
44-
description = "How many local executors to use for executing tests"
45-
defaultValue = 1
33+
group("predictiveTestSelection") {
34+
bool("enabled") {
35+
description = "Whether or not to use Predictive Test Selection for selecting tests to execute"
36+
defaultValue = true
37+
}
4638
}
47-
integer("maxRemoteExecutors") {
48-
description = "How many remote executors to request for executing tests"
39+
group("testDistribution") {
40+
bool("enabled") {
41+
description = "Whether or not to use Test Distribution for executing tests"
42+
defaultValue = false
43+
fromEnvironment()
44+
}
45+
integer("maxLocalExecutors") {
46+
description = "How many local executors to use for executing tests"
47+
defaultValue = 1
48+
}
49+
integer("maxRemoteExecutors") {
50+
description = "How many remote executors to request for executing tests"
51+
}
4952
}
5053
}
5154
}

‎gradle/plugins/common/src/main/kotlin/junitbuild.testing-conventions.gradle.kts

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ tasks.withType<Test>().configureEach {
2222
maxRetries = buildParameters.testing.retries.orElse(if (buildParameters.ci) 2 else 0)
2323
}
2424
distribution {
25-
enabled.convention(buildParameters.develocity.testDistribution.enabled && (!buildParameters.ci || System.getenv("GRADLE_ENTERPRISE_ACCESS_KEY").isNotBlank()))
26-
maxLocalExecutors = buildParameters.develocity.testDistribution.maxLocalExecutors
27-
maxRemoteExecutors = buildParameters.develocity.testDistribution.maxRemoteExecutors
25+
enabled.convention(buildParameters.junit.develocity.testDistribution.enabled && (!buildParameters.ci || System.getenv("GRADLE_ENTERPRISE_ACCESS_KEY").isNotBlank()))
26+
maxLocalExecutors = buildParameters.junit.develocity.testDistribution.maxLocalExecutors
27+
maxRemoteExecutors = buildParameters.junit.develocity.testDistribution.maxRemoteExecutors
2828
if (buildParameters.ci) {
2929
when {
3030
OperatingSystem.current().isLinux -> requirements.add("os=linux")
@@ -34,7 +34,7 @@ tasks.withType<Test>().configureEach {
3434
}
3535
}
3636
predictiveSelection {
37-
enabled = buildParameters.develocity.predictiveTestSelection.enabled
37+
enabled = buildParameters.junit.develocity.predictiveTestSelection.enabled
3838

3939
// Ensure PTS works when publishing Build Scans to scans.gradle.com
4040
this as PredictiveTestSelectionExtensionInternal

‎settings.gradle.kts

+4-3
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ gradleEnterprise {
5252
}
5353
}
5454

55-
if (buildParameters.develocity.testDistribution.enabled) {
55+
if (buildParameters.junit.develocity.testDistribution.enabled) {
5656
tag("test-distribution")
5757
}
5858
}
@@ -62,15 +62,16 @@ buildCache {
6262
local {
6363
isEnabled = !buildParameters.ci
6464
}
65+
val buildCacheServer = buildParameters.junit.develocity.buildCache.server
6566
if (useDevelocityInstance) {
6667
remote(gradleEnterprise.buildCache) {
67-
server = buildParameters.buildCache.server.orNull
68+
server = buildCacheServer.orNull
6869
val authenticated = System.getenv("GRADLE_ENTERPRISE_ACCESS_KEY") != null
6970
isPush = buildParameters.ci && authenticated
7071
}
7172
} else {
7273
remote<HttpBuildCache> {
73-
url = uri(buildParameters.buildCache.server.getOrElse(develocityServer)).resolve("/cache/")
74+
url = uri(buildCacheServer.getOrElse(develocityServer)).resolve("/cache/")
7475
}
7576
}
7677
}

0 commit comments

Comments
 (0)