Skip to content

Commit ad7840e

Browse files
committed
Go back to not defining VCS root in code
1 parent 6722c52 commit ad7840e

File tree

1 file changed

+4
-18
lines changed

1 file changed

+4
-18
lines changed

.teamcity/settings.kts

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import jetbrains.buildServer.configs.kotlin.AbsoluteId
21
import jetbrains.buildServer.configs.kotlin.BuildFeatures
32
import jetbrains.buildServer.configs.kotlin.BuildType
3+
import jetbrains.buildServer.configs.kotlin.DslContext
44
import jetbrains.buildServer.configs.kotlin.FailureAction
55
import jetbrains.buildServer.configs.kotlin.buildFeatures.PullRequests
66
import jetbrains.buildServer.configs.kotlin.buildFeatures.commitStatusPublisher
@@ -10,7 +10,6 @@ import jetbrains.buildServer.configs.kotlin.buildSteps.gradle
1010
import jetbrains.buildServer.configs.kotlin.project
1111
import jetbrains.buildServer.configs.kotlin.projectFeatures.githubIssues
1212
import jetbrains.buildServer.configs.kotlin.triggers.vcs
13-
import jetbrains.buildServer.configs.kotlin.vcs.GitVcsRoot
1413
import jetbrains.buildServer.configs.kotlin.version
1514

1615
/*
@@ -37,21 +36,8 @@ To debug in IntelliJ Idea, open the 'Maven Projects' tool window (View
3736

3837
version = "2023.11"
3938

40-
object AnvilVcsRoot : GitVcsRoot() {
41-
init {
42-
id = AbsoluteId("anvil_git")
43-
name = "anvil"
44-
url = "https://github.com/anvilpowered/anvil.git"
45-
branch = "refs/heads/master"
46-
branchSpec = "+:refs/heads/*"
47-
userNameStyle = UserNameStyle.FULL
48-
}
49-
}
50-
5139
project {
5240

53-
vcsRoot(AnvilVcsRoot)
54-
5541
val test = Test()
5642
val style = Style()
5743
val pluginJar = PluginJar()
@@ -77,7 +63,7 @@ project {
7763

7864
fun BuildType.configureVcs() {
7965
vcs {
80-
root(AnvilVcsRoot)
66+
root(DslContext.settingsRoot)
8167
}
8268
}
8369

@@ -97,7 +83,7 @@ fun BuildType.configureTriggers() {
9783
fun BuildFeatures.configureBaseFeatures() {
9884
perfmon {}
9985
commitStatusPublisher {
100-
vcsRootExtId = "${AnvilVcsRoot.id}"
86+
vcsRootExtId = "${DslContext.settingsRoot.id}"
10187
publisher = github {
10288
githubUrl = "https://api.github.com"
10389
authType = personalToken {
@@ -109,7 +95,7 @@ fun BuildFeatures.configureBaseFeatures() {
10995

11096
fun BuildFeatures.configurePullRequests() {
11197
pullRequests {
112-
vcsRootExtId = "${AnvilVcsRoot.id}"
98+
vcsRootExtId = "${DslContext.settingsRoot.id}"
11399
provider = github {
114100
authType = token {
115101
token = "credentialsJSON:f57a4fdd-fb30-41c0-9983-620364336d03"

0 commit comments

Comments
 (0)