Skip to content

Merge maintenance/mps20261 into master #1864

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mps-ci-buildbot (mps-ci-buildbot) merged 4 commits into from
Aug 10, 2026
+31 −27
Merged

Merge maintenance/mps20261 into master #1864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
321a148
fix(ci): move helpers to a separate file
sergej-koscejev Aug 10, 2026
64e0bac
Merge pull request #1861 from JetBrains/fix/teamcity-kotlin-dsl
sergej-koscejev Aug 10, 2026
db6b043
Merge pull request #1862 from JetBrains/merge/mps20251
mps-ci-buildbot Aug 10, 2026
2bd1898
Merge pull request #1863 from JetBrains/merge/mps20261
mps-ci-buildbot Aug 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions .teamcity/helpers.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import jetbrains.buildServer.configs.kotlin.BuildFeatures
import jetbrains.buildServer.configs.kotlin.buildFeatures.XmlReport
import jetbrains.buildServer.configs.kotlin.buildFeatures.commitStatusPublisher
import jetbrains.buildServer.configs.kotlin.buildFeatures.xmlReport

fun BuildFeatures.collectJUnitReports() {
xmlReport {
reportType = XmlReport.XmlReportType.JUNIT
rules = """
+:**/TEST-*.xml
+:**/TestResult.xml
-:**/TEST-junit-jupiter.xml
-:**/TEST-junit-vintage.xml
""".trimIndent()
}
}

fun BuildFeatures.publishCommitStatusToGitHub() {
commitStatusPublisher {
publisher = github {
githubUrl = "https://api.github.com"
authType = storedToken {
tokenId = "tc_token_id:CID_95b90d155fa2849389b4b3873c680dca:-1:1a222f48-4bdd-4b59-a694-8e1c718f2f3d"
}
}
}
}
31 changes: 4 additions & 27 deletions .teamcity/settings.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
import jetbrains.buildServer.configs.kotlin.*
import jetbrains.buildServer.configs.kotlin.BuildStep
import jetbrains.buildServer.configs.kotlin.BuildType
import jetbrains.buildServer.configs.kotlin.buildFeatures.PullRequests
import jetbrains.buildServer.configs.kotlin.buildFeatures.XmlReport
import jetbrains.buildServer.configs.kotlin.buildFeatures.commitStatusPublisher
import jetbrains.buildServer.configs.kotlin.buildFeatures.pullRequests
import jetbrains.buildServer.configs.kotlin.buildFeatures.sshAgent
import jetbrains.buildServer.configs.kotlin.buildFeatures.xmlReport
import jetbrains.buildServer.configs.kotlin.buildSteps.gradle
import jetbrains.buildServer.configs.kotlin.buildSteps.preliminaryMerge
import jetbrains.buildServer.configs.kotlin.buildSteps.script
import jetbrains.buildServer.configs.kotlin.project
import jetbrains.buildServer.configs.kotlin.projectFeatures.UntrustedBuildsSettings
import jetbrains.buildServer.configs.kotlin.projectFeatures.githubIssues
import jetbrains.buildServer.configs.kotlin.projectFeatures.untrustedBuildsSettings
import jetbrains.buildServer.configs.kotlin.triggers.schedule
import jetbrains.buildServer.configs.kotlin.triggers.vcs
import jetbrains.buildServer.configs.kotlin.vcs.GitVcsRoot
import jetbrains.buildServer.configs.kotlin.version

/*
The settings script is an entry point for defining a TeamCity
Expand Down Expand Up @@ -61,29 +61,6 @@ project {
}
}

fun BuildFeatures.collectJUnitReports() {
xmlReport {
reportType = XmlReport.XmlReportType.JUNIT
rules = """
+:**/TEST-*.xml
+:**/TestResult.xml
-:**/TEST-junit-jupiter.xml
-:**/TEST-junit-vintage.xml
""".trimIndent()
}
}

fun BuildFeatures.publishCommitStatusToGitHub() {
commitStatusPublisher {
publisher = github {
githubUrl = "https://api.github.com"
authType = storedToken {
tokenId = "tc_token_id:CID_95b90d155fa2849389b4b3873c680dca:-1:1a222f48-4bdd-4b59-a694-8e1c718f2f3d"
}
}
}
}

object Build : BuildType({
name = "build"

Expand Down