Skip to content

Commit ff6e9c7

Browse files
authored
Merge pull request #5475 from JetBrains/marat.akhin/kotlin-grammar-from-a-tag
Use grammar/latest tag for Kotlin grammar build
2 parents cc1f5e5 + 1b51cd8 commit ff6e9c7

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

.teamcity/kotlinlang/SiteProject.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package kotlinlang
33
import jetbrains.buildServer.configs.kotlin.Project
44
import kotlinlang.builds.*
55
import kotlinlang.vcsRoots.GrammarGenerator
6-
import kotlinlang.vcsRoots.KotlinSpec
6+
import kotlinlang.vcsRoots.KotlinSpecGrammar
77
import kotlinlang.vcsRoots.WebHelp
88
import templates.DockerImageBuilder
99

@@ -29,6 +29,6 @@ object SiteProject : Project({
2929
template(DockerImageBuilder)
3030

3131
vcsRoot(GrammarGenerator)
32-
vcsRoot(KotlinSpec)
32+
vcsRoot(KotlinSpecGrammar)
3333
vcsRoot(WebHelp)
3434
})

.teamcity/kotlinlang/builds/BuildKotlinGrammar.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package kotlinlang.builds
33
import jetbrains.buildServer.configs.kotlin.BuildType
44
import jetbrains.buildServer.configs.kotlin.buildSteps.gradle
55
import kotlinlang.vcsRoots.GrammarGenerator
6-
import kotlinlang.vcsRoots.KotlinSpec
6+
import kotlinlang.vcsRoots.KotlinSpecGrammar
77

88
object BuildKotlinGrammar : BuildType({
99
name = "Kotlin Grammar"
@@ -12,7 +12,7 @@ object BuildKotlinGrammar : BuildType({
1212

1313
vcs {
1414
root(GrammarGenerator)
15-
root(KotlinSpec, "+:/grammar/src/main/antlr => grammar", "-:/grammar/testData")
15+
root(KotlinSpecGrammar, "+:/grammar/src/main/antlr => grammar")
1616

1717
cleanCheckout = true
1818
}

.teamcity/kotlinlang/vcsRoots/KotlinSpec.kt renamed to .teamcity/kotlinlang/vcsRoots/KotlinSpecGrammar.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ package kotlinlang.vcsRoots
22

33
import jetbrains.buildServer.configs.kotlin.vcs.GitVcsRoot
44

5-
object KotlinSpec: GitVcsRoot({
6-
name = "Kotlin Spec VCS root"
5+
object KotlinSpecGrammar: GitVcsRoot({
6+
name = "Kotlin Spec Grammar VCS root"
77
url = "ssh://git@github.com/Kotlin/kotlin-spec"
8-
branch = "refs/heads/release"
8+
branch = "refs/tags/grammar/latest"
99
authMethod = uploadedKey {
1010
uploadedKey = "default teamcity key"
1111
}
12-
})
12+
})

0 commit comments

Comments
 (0)