Skip to content

Commit 9dc4e20

Browse files
Abduqodiri Qurbonzodaqurbonzoda
authored andcommitted
Introduce additionalConfiguration.kt
1 parent 89cb45a commit 9dc4e20

File tree

3 files changed

+13
-1
lines changed

3 files changed

+13
-1
lines changed
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/*
2+
* Copyright 2016-2020 JetBrains s.r.o.
3+
* Use of this source code is governed by the Apache 2.0 License that can be found in the LICENSE.txt file.
4+
*/
5+
6+
import jetbrains.buildServer.configs.kotlin.v2018_2.Project
7+
8+
fun Project.additionalConfiguration() {
9+
}

main/resources/teamcity/settings.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ project {
5656
}
5757

5858
buildTypesOrder = listOf(buildAll, buildVersion, *builds.toTypedArray(), deployPublish, deployConfigure, *deploys.toTypedArray())
59+
60+
additionalConfiguration()
5961
}
6062

6163
fun Project.buildVersion() = BuildType {

main/src/kotlinx/team/infra/TeamCity.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ fun Project.configureTeamCityConfigGenerator(teamcity: TeamCityConfiguration) {
3434
it
3535
.replace("<artifactId>resource</artifactId>", "<artifactId>teamcity</artifactId>")
3636
}
37-
copyResource(teamcityDir, "settings.kts")
3837
copyResource(teamcityDir, "utils.kt") { text ->
3938
val bintrayUser = teamcity.bintrayUser
4039
?: throw KotlinInfrastructureException("TeamCity configuration should specify `bintrayUser` parameter")
@@ -45,6 +44,8 @@ fun Project.configureTeamCityConfigGenerator(teamcity: TeamCityConfiguration) {
4544
.replace("<<BINTRAY_TOKEN>>", bintrayToken)
4645
.replace("<<JDK>>", teamcity.jdk)
4746
}
47+
copyResource(teamcityDir, "additionalConfiguration.kt", override = false)
48+
copyResource(teamcityDir, "settings.kts")
4849
}
4950
}
5051
}

0 commit comments

Comments
 (0)