Skip to content

Commit ee5bd29

Browse files
authored
Merge branch 'master' into aepanchi-string
2 parents 31d8375 + 072125e commit ee5bd29

339 files changed

Lines changed: 3021 additions & 1137 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ generated
4848

4949
/reports*
5050
/data/page_views_map.json
51-
test-results
51+
/test-results
52+
/playwright-report
5253

5354
public/data
5455
test/storage-state.json

.teamcity/common/E2ERunner.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
package common
22

3-
import jetbrains.buildServer.configs.kotlin.BuildStep
43
import jetbrains.buildServer.configs.kotlin.BuildType
5-
import jetbrains.buildServer.configs.kotlin.buildSteps.ScriptBuildStep
64

75
open class E2ERunner(init: BuildType.() -> Unit) : BuildType({
86
artifactRules = """
9-
+:test-results/* => test-results.zip
7+
+:playwright-report/** => playwright-report.zip
108
""".trimIndent()
119

1210
params {

.teamcity/common/ReferenceProject.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ open class ReferenceProject(val urlPart: String, val projectTitle: String = urlP
118118
currentVersion.apply {
119119
triggers {
120120
vcs {
121+
enabled = !isProjectPlayground()
121122
id = "trigger-vcs-default-trigger-id"
122123
branchFilter = "+:<default>"
123124
}

.teamcity/documentation/builds/WritersideBuilder.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package documentation.builds
22

3+
import common.extensions.isProjectPlayground
34
import jetbrains.buildServer.configs.kotlin.BuildType
45
import jetbrains.buildServer.configs.kotlin.buildSteps.ScriptBuildStep
56
import jetbrains.buildServer.configs.kotlin.buildSteps.script
@@ -25,6 +26,7 @@ abstract class WritersideBuilder(
2526

2627
triggers {
2728
vcs {
29+
enabled = !isProjectPlayground()
2830
branchFilter = "+:<default>"
2931
}
3032
}

.teamcity/kotlinlang/builds/BuildSearchIndex.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package kotlinlang.builds
22

33
import BuildParams.SEARCH_INDEX_NAME
4+
import common.extensions.isProjectPlayground
45
import jetbrains.buildServer.configs.kotlin.triggers.schedule
56
import references.builds.stdlib.BuildStdlibApiReference
67
import templates.TemplateSearchIndex
@@ -15,6 +16,7 @@ object BuildSearchIndex : TemplateSearchIndex({
1516

1617
triggers {
1718
schedule {
19+
enabled = !isProjectPlayground()
1820
schedulingPolicy = cron {
1921
hours = "3"
2022
dayOfMonth = "*/2"

.teamcity/kotlinlang/builds/BuildSitePages.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package kotlinlang.builds
22

33
import BuildParams.API_URLS
44
import BuildParams.KLANG_NODE_CONTAINER
5+
import common.extensions.isProjectPlayground
56
import documentation.builds.KotlinMultiplatform
67
import documentation.builds.KotlinWithCoroutines
78
import jetbrains.buildServer.configs.kotlin.BuildType
@@ -27,6 +28,7 @@ object BuildSitePages : BuildType({
2728

2829
triggers {
2930
vcs {
31+
enabled = !isProjectPlayground()
3032
branchFilter = "+:<default>"
3133
}
3234
finishBuildTrigger {

.teamcity/kotlinlang/builds/FetchBlogNews.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ object FetchBlogNews : BuildType({
2828

2929
triggers {
3030
schedule {
31+
enabled = !isProjectPlayground()
3132
branchFilter = "+:<default>"
3233
schedulingPolicy = cron {
3334
hours = "9"

.teamcity/landings/builds/BuildLandingPage.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package landings.builds
22

33
import BuildParams.KLANG_NODE_CONTAINER
4+
import common.extensions.isProjectPlayground
45
import jetbrains.buildServer.configs.kotlin.BuildType
56
import jetbrains.buildServer.configs.kotlin.buildSteps.script
67
import jetbrains.buildServer.configs.kotlin.triggers.vcs
78
import landings.LandingConfiguration
89
import landings.createVcsRootForLanding
9-
import vcsRoots.KotlinLangOrg
1010

1111
/**
1212
* Build type for building a Vite landing page.
@@ -34,6 +34,7 @@ class BuildLandingPage(val config: LandingConfiguration) : BuildType({
3434

3535
triggers {
3636
vcs {
37+
enabled = !isProjectPlayground()
3738
branchFilter = "+:${config.branch}"
3839
}
3940
}

.teamcity/references/BuildApiPages.kt

Lines changed: 2 additions & 0 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.isProjectPlayground
45
import common.extensions.scriptGenerateSitemap
56
import jetbrains.buildServer.configs.kotlin.BuildStep
67
import jetbrains.buildServer.configs.kotlin.BuildSteps
@@ -50,6 +51,7 @@ abstract class BuildApiPages(
5051

5152
triggers {
5253
vcs {
54+
enabled = !isProjectPlayground()
5355
id = "trigger-vcs-default-trigger-id"
5456
branchFilter = "+:<default>"
5557
}.apply(vcsDefaultTrigger)

.teamcity/templates/TemplateSearchIndex.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@ package templates
22

33
import BuildParams.SEARCH_APP_ID
44
import BuildParams.KLANG_NODE_CONTAINER
5+
import common.extensions.isProjectPlayground
56
import jetbrains.buildServer.configs.kotlin.BuildType
67
import jetbrains.buildServer.configs.kotlin.buildSteps.ScriptBuildStep
78
import jetbrains.buildServer.configs.kotlin.triggers.schedule
89
import kotlinlang.builds.PageViews
910
import vcsRoots.KotlinLangOrg
1011

11-
const val SCRIPT_PATH = "scripts/dist";
12+
const val SCRIPT_PATH = "scripts/dist"
1213

1314
fun scriptDistAnalyze(block: ScriptBuildStep.() -> Unit) = ScriptBuildStep {
1415
id = "script-dist-analyze"
@@ -50,6 +51,7 @@ open class TemplateSearchIndex(init: BuildType.() -> Unit) : BuildType({
5051

5152
triggers {
5253
schedule {
54+
enabled = isProjectPlayground()
5355
schedulingPolicy = cron {
5456
hours = "4"
5557
dayOfMonth = "*/2"

0 commit comments

Comments
 (0)