PenaDevops/delve
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing branch selection in TeamCity builds (#2311)

Browse Source 
* Enable pull-requests in all builds

Otherwise test builds always use the master branch

* Apply change in settings made in UI
This commit is contained in:
nd 2021-01-20 14:02:58 +01:00 committed by GitHub
parent 9030fc837b
commit 9c03e2b5de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
.teamcity/patches/buildTypes/AggregatorBuild.kts vendored
View File

@ -1,37 +0,0 @@
package patches.buildTypes
import jetbrains.buildServer.configs.kotlin.v2019_2.*
import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.CommitStatusPublisher
import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.commitStatusPublisher
import jetbrains.buildServer.configs.kotlin.v2019_2.ui.*
/*
This patch script was generated by TeamCity on settings change in UI.
To apply the patch, change the buildType with id = 'AggregatorBuild'
accordingly, and delete the patch script.
*/
changeBuildType(RelativeId("AggregatorBuild")) {
features {
val feature1 = find<CommitStatusPublisher> {
commitStatusPublisher {
vcsRootExtId = "${DslContext.settingsRoot.id}"
publisher = github {
githubUrl = "https://api.github.com"
authType = personalToken {
token = "credentialsJSON:5dc93081-e0b2-41e2-b8f0-dea3c96e6426"
}
}
param("github_oauth_user", "derekparker")
}
}
feature1.apply {
publisher = github {
githubUrl = "https://api.github.com"
authType = personalToken {
token = "credentialsJSON:48af6e38-536d-4acb-ae2d-2fba57b6f3db"
}
}
param("github_oauth_user", "")
}
}
}

27
.teamcity/settings.kts vendored
View File

@ -81,24 +81,16 @@ class AggregatorBuild(tests: Collection<BuildType>) : BuildType({
}
features {
pullRequests {
vcsRootExtId = "${DslContext.settingsRoot.id}"
provider = github {
authType = token {
token = "credentialsJSON:5dc93081-e0b2-41e2-b8f0-dea3c96e6426"
}
filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY
}
}
enablePullRequests()
commitStatusPublisher {
vcsRootExtId = "${DslContext.settingsRoot.id}"
publisher = github {
githubUrl = "https://api.github.com"
authType = personalToken {
token = "credentialsJSON:5dc93081-e0b2-41e2-b8f0-dea3c96e6426"
token = "credentialsJSON:48af6e38-536d-4acb-ae2d-2fba57b6f3db"
}
}
param("github_oauth_user", "derekparker")
param("github_oauth_user", "")
}
}
})
@ -194,8 +186,21 @@ class TestBuild(val os: String, val arch: String, version: String, buildId: Abso
}
features {
enablePullRequests()
golang {
testFormat = "json"
}
}
})
fun enablePullRequests() {
pullRequests {
vcsRootExtId = "${DslContext.settingsRoot.id}"
provider = github {
authType = token {
token = "credentialsJSON:5dc93081-e0b2-41e2-b8f0-dea3c96e6426"
}
filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY
}
}
}