Skip to content

Commit 3ca7569

Browse files
committed
Update teamcity configuration
1 parent bd73c0f commit 3ca7569

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

.teamcity/settings.kts

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ val bintrayUserName = "orangy"
3333
val bintrayToken = "credentialsJSON:9a48193c-d16d-46c7-8751-2fb434b09e07"
3434

3535
val platforms = listOf("Windows", "Linux", "Mac OS X")
36+
val jdk = "JDK_18_x64"
3637

3738
project {
3839
// Disable editing of project and build settings from the UI to avoid issues with TeamCity
@@ -51,7 +52,7 @@ project {
5152
}
5253
buildAll.dependsOn(build) {
5354
artifacts {
54-
artifactRules = "+:maven=>maven"
55+
artifactRules = "+:maven=>maven\n+:api=>api"
5556
}
5657
}
5758
}
@@ -88,18 +89,18 @@ fun Project.build(platform: String) = platform(platform, "Build") {
8889
steps {
8990
gradle {
9091
name = "Build and Test $platform Binaries"
91-
jdkHome = "%env.JDK_18_x64%"
92+
jdkHome = "%env.$jdk%"
9293
jvmArgs = "-Xmx1g"
9394
tasks = "clean publishToBuildLocal check"
9495
// --continue is needed to run tests for all targets even if one target fails
95-
gradleParams = "-P$versionSuffixParameter=SNAPSHOT -P$teamcitySuffixParameter=%build.counter% --continue"
96+
gradleParams = "--info --stacktrace -P$versionSuffixParameter=SNAPSHOT -P$teamcitySuffixParameter=%build.counter% --continue"
9697
buildFile = ""
9798
gradleWrapperPath = ""
9899
}
99100
}
100101

101102
// What files to publish as build artifacts
102-
artifactRules = "+:build/maven=>maven"
103+
artifactRules = "+:build/maven=>maven\n+:build/api=>api"
103104
}
104105

105106
fun BuildType.dependsOn(build: BuildType, configure: Dependency.() -> Unit) =
@@ -128,8 +129,6 @@ fun Project.deployConfigure() = BuildType {
128129
param("bintray-user", bintrayUserName)
129130
password("bintray-key", bintrayToken)
130131
param(versionSuffixParameter, "dev-%build.counter%")
131-
// Intentionally left empty. Gradle will ignore empty values and in custom build it can be specified
132-
param(releaseVersionParameter, "dev")
133132
}
134133

135134
requirements {
@@ -141,9 +140,9 @@ fun Project.deployConfigure() = BuildType {
141140
gradle {
142141
name = "Verify Gradle Configuration"
143142
tasks = "clean publishBintrayCreateVersion"
144-
gradleParams = "-P$versionSuffixParameter=%$versionSuffixParameter% -P$releaseVersionParameter=%$releaseVersionParameter% -PbintrayApiKey=%bintray-key% -PbintrayUser=%bintray-user%"
143+
gradleParams = "--info --stacktrace -P$versionSuffixParameter=%$versionSuffixParameter% -P$releaseVersionParameter=%$releaseVersionParameter% -PbintrayApiKey=%bintray-key% -PbintrayUser=%bintray-user%"
145144
buildFile = ""
146-
jdkHome = "%env.JDK_18%"
145+
jdkHome = "%env.$jdk%"
147146
}
148147
}
149148
}.also { buildType(it) }
@@ -154,7 +153,10 @@ fun Project.deployPublish(configureBuild: BuildType) = BuildType {
154153
type = BuildTypeSettings.Type.COMPOSITE
155154
params {
156155
param(versionSuffixParameter, "${configureBuild.depParamRefs[versionSuffixParameter]}")
157-
param(releaseVersionParameter, "${configureBuild.depParamRefs[releaseVersionParameter]}")
156+
157+
// Tell configuration build how to get release version parameter from this build
158+
// "dev" is the default and means publishing is not releasing to public
159+
param(configureBuild.reverseDepParamRefs[releaseVersionParameter].name, "dev")
158160
}
159161
commonConfigure()
160162
}.also { buildType(it) }.dependsOnSnapshot(configureBuild)
@@ -178,9 +180,9 @@ fun Project.deploy(platform: String, configureBuild: BuildType) = platform(platf
178180
steps {
179181
gradle {
180182
name = "Deploy $platform Binaries"
181-
jdkHome = "%env.JDK_18_x64%"
183+
jdkHome = "%env.$jdk%"
182184
jvmArgs = "-Xmx1g"
183-
gradleParams = "-P$versionSuffixParameter=%$versionSuffixParameter% -P$releaseVersionParameter=%$releaseVersionParameter% -PbintrayApiKey=%bintray-key% -PbintrayUser=%bintray-user%"
185+
gradleParams = "--info --stacktrace -P$versionSuffixParameter=%$versionSuffixParameter% -P$releaseVersionParameter=%$releaseVersionParameter% -PbintrayApiKey=%bintray-key% -PbintrayUser=%bintray-user%"
184186
tasks = "clean build publish"
185187
buildFile = ""
186188
gradleWrapperPath = ""

0 commit comments

Comments
 (0)