Skip to content

Commit fa3e572

Browse files
committed
chore(ci/api): compose core api - fix stories path
1 parent b1b9b41 commit fa3e572

File tree

5 files changed

+8
-17
lines changed

5 files changed

+8
-17
lines changed

.teamcity/common/ReferenceProject.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ open class ReferenceProject(val urlPart: String, val projectTitle: String = urlP
5858
}
5959

6060
steps {
61-
scriptNoRobots(workingDir)
62-
scriptGenerateSitemap(workingDir)
61+
step(scriptNoRobots(workingDir))
62+
step(scriptGenerateSitemap(workingDir))
6363
}
6464

6565
dependencies {

.teamcity/common/extensions/steps.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
package common.extensions
22

33
import jetbrains.buildServer.configs.kotlin.BuildStep
4-
import jetbrains.buildServer.configs.kotlin.BuildSteps
54
import jetbrains.buildServer.configs.kotlin.buildSteps.ScriptBuildStep
6-
import jetbrains.buildServer.configs.kotlin.buildSteps.script
5+
import templates.scriptDistAnalyze
76

8-
fun BuildSteps.scriptGenerateSitemap(pagesRoot: String = DEFAULT_DOKKA_PATH): BuildStep = script {
7+
fun scriptGenerateSitemap(pagesRoot: String = DEFAULT_DOKKA_PATH): BuildStep = scriptDistAnalyze {
98
//language=sh
109
scriptContent += "\n" + """
1110
cd ../../dist
1211
cp ./sitemap.xml "../$pagesRoot/"
1312
""".trimIndent()
1413
}
1514

16-
fun BuildSteps.scriptNoRobots(pagesRoot: String, block: ScriptBuildStep.() -> Unit = {}) = script {
15+
fun scriptNoRobots(pagesRoot: String, block: ScriptBuildStep.() -> Unit = {}) = ScriptBuildStep {
1716
name = "Add no robots for older versions"
1817
workingDir = pagesRoot
1918
//language=sh

.teamcity/references/BuildApiPages.kt

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package references
22

33
import BuildParams.DOKKA_TEMPLATES_VERSION
4+
import common.extensions.scriptGenerateSitemap
45
import jetbrains.buildServer.configs.kotlin.BuildStep
56
import jetbrains.buildServer.configs.kotlin.BuildSteps
67
import jetbrains.buildServer.configs.kotlin.BuildType
@@ -9,7 +10,6 @@ import jetbrains.buildServer.configs.kotlin.buildSteps.ScriptBuildStep
910
import jetbrains.buildServer.configs.kotlin.triggers.VcsTrigger
1011
import jetbrains.buildServer.configs.kotlin.triggers.vcs
1112
import templates.SCRIPT_PATH
12-
import templates.scriptDistAnalyze
1313
import vcsRoots.KotlinLangOrg
1414

1515
const val DEFAULT_DOKKA_PATH = "build/dokka/htmlMultiModule"
@@ -127,14 +127,6 @@ fun copyDokkaApiResult(
127127
dockerImage = "alpine"
128128
}.apply(init)
129129

130-
fun scriptGenerateSitemap(pagesRoot: String = DEFAULT_DOKKA_PATH): BuildStep = scriptDistAnalyze {
131-
//language=sh
132-
scriptContent += "\n" + """
133-
cd ../../dist
134-
cp ./sitemap.xml "../$pagesRoot/"
135-
""".trimIndent()
136-
}
137-
138130
fun scriptNoRobots(pagesRoot: String, block: ScriptBuildStep.() -> Unit = {}) = ScriptBuildStep {
139131
name = "Add no robots for older versions"
140132
workingDir = pagesRoot

.teamcity/references/builds/compose/ComposeMultiplatformCore.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class ComposeMultiplatformCore(init: ComposeMultiplatformCore.() -> Unit) : Refe
5151
downloadAndroidSdk()
5252
dokkaBuildHtml(version) {
5353
tasks = ":mpp:apiReferences:buildApiReferencesWithStories"
54-
gradleParams += " -PapiReferences.storiesRootPath=/stories"
54+
gradleParams += " -PapiReferences.storiesRootPath=/api/${urlPart}/stories"
5555
jdkHome = "%env.JDK_17_0%"
5656
}
5757
}

.teamcity/references/builds/stdlib/BuildStdlibApiReference.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package references.builds.stdlib
22

33
import BuildParams.CORE_API_BUILD_ID
4+
import common.extensions.scriptGenerateSitemap
45
import jetbrains.buildServer.configs.kotlin.AbsoluteId
56
import jetbrains.buildServer.configs.kotlin.BuildType
67
import jetbrains.buildServer.configs.kotlin.buildSteps.script
7-
import references.scriptGenerateSitemap
88
import references.scriptNoRobots
99
import templates.SCRIPT_PATH
1010
import vcsRoots.KotlinLangOrg

0 commit comments

Comments
 (0)