Skip to content

Commit 54fd93b

Browse files
Quattro8zoobestik
authored andcommitted
1. Reverted AUTO checkout rule for documentation vcs repositories
2. Updated writerside builder build configuration with the container wrapper feature 3. Updated version of the writerside builder to the latest one (released version)
1 parent f27722d commit 54fd93b

File tree

2 files changed

+19
-16
lines changed

2 files changed

+19
-16
lines changed

.teamcity/documentation/builds/WritersideBuilder.kt

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ abstract class WritersideBuilder(
99
instance: String,
1010
customInit: BuildType.() -> Unit = {}
1111
): BuildType({
12-
val dockerImageTag = "2.1.2176-p8483"
12+
val dockerImageTag = "2025.07.8502"
1313
val frontend = "file:///opt/static/"
1414

1515
name = "${instance.uppercase()} documentation build"
@@ -22,17 +22,20 @@ abstract class WritersideBuilder(
2222
steps {
2323
script {
2424
name = "Build $module/$instance documentation with the docker"
25-
// language=sh
2625
scriptContent = """
27-
docker run --rm -v %teamcity.build.checkoutDir%:/opt/sources \
28-
-v %teamcity.build.checkoutDir%/static:/opt/static \
29-
-e SOURCE_DIR=/opt/sources \
30-
-e MODULE_INSTANCE=$module/$instance \
31-
-e RUNNER=teamcity \
32-
-e FRONTEND=$frontend \
33-
-e OUTPUT_DIR=/opt/sources/artifacts \
34-
registry.jetbrains.team/p/writerside/builder/writerside-builder:$dockerImageTag
35-
"""
26+
#!/bin/bash
27+
bash -euo pipefail /usr/local/bin/script.sh
28+
""".trimIndent()
29+
dockerImage = "registry.jetbrains.team/p/writerside/builder/writerside-builder:$dockerImageTag"
30+
dockerRunParameters = """
31+
--rm -v %teamcity.build.checkoutDir%:/opt/sources
32+
-v %teamcity.build.checkoutDir%/static:/opt/static
33+
-e SOURCE_DIR=/opt/sources
34+
-e MODULE_INSTANCE=$module/$instance
35+
-e RUNNER=teamcity
36+
-e FRONTEND=$frontend
37+
-e OUTPUT_DIR=/opt/sources/artifacts
38+
""".trimIndent()
3639
}
3740
}
3841

.teamcity/documentation/vcsRoots/DocumentationRoots.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ object KotlinMultiplatformVCS: GitVcsRoot ({
88
url = "[email protected]:JetBrains/kotlin-multiplatform-dev-docs.git"
99
branch = "refs/heads/master"
1010
branchSpec = "+:refs/heads/*"
11-
checkoutPolicy = AgentCheckoutPolicy.NO_MIRRORS
11+
checkoutPolicy = AgentCheckoutPolicy.AUTO
1212
authMethod = uploadedKey {
1313
uploadedKey = "default teamcity key"
1414
}
@@ -20,7 +20,7 @@ object KotlinReferenceRoot: GitVcsRoot ({
2020
url = "[email protected]:JetBrains/kotlin-web-site.git"
2121
branch = "refs/heads/master"
2222
branchSpec = "+:refs/heads/*"
23-
checkoutPolicy = AgentCheckoutPolicy.NO_MIRRORS
23+
checkoutPolicy = AgentCheckoutPolicy.AUTO
2424
checkoutSubmodules = CheckoutSubmodules.SUBMODULES_CHECKOUT
2525
authMethod = uploadedKey {
2626
uploadedKey = "default teamcity key"
@@ -32,7 +32,7 @@ object KotlinxCoroutinesRoot: GitVcsRoot ({
3232
url = "[email protected]:Kotlin/kotlinx.coroutines.git"
3333
branch = "refs/heads/master"
3434
branchSpec = "+:refs/heads/*"
35-
checkoutPolicy = AgentCheckoutPolicy.NO_MIRRORS
35+
checkoutPolicy = AgentCheckoutPolicy.AUTO
3636
authMethod = uploadedKey {
3737
uploadedKey = "default teamcity key"
3838
}
@@ -43,7 +43,7 @@ object KotlinxLincheckRoot: GitVcsRoot ({
4343
url = "[email protected]:JetBrains/lincheck.git"
4444
branch = "refs/heads/master"
4545
branchSpec = "+:refs/heads/*"
46-
checkoutPolicy = AgentCheckoutPolicy.NO_MIRRORS
46+
checkoutPolicy = AgentCheckoutPolicy.AUTO
4747
authMethod = uploadedKey {
4848
uploadedKey = "default teamcity key"
4949
}
@@ -54,7 +54,7 @@ object DokkaRoot: GitVcsRoot ({
5454
url = "[email protected]:Kotlin/dokka.git"
5555
branch = "refs/heads/master"
5656
branchSpec = "+:refs/heads/*"
57-
checkoutPolicy = AgentCheckoutPolicy.NO_MIRRORS
57+
checkoutPolicy = AgentCheckoutPolicy.AUTO
5858
authMethod = uploadedKey {
5959
uploadedKey = "default teamcity key"
6060
}

0 commit comments

Comments
 (0)