Skip to content

Commit 35d1f4b

Browse files
authored
Merge pull request #375 from gradle/snoopcheri/use-custom-git-credential-helper
Configure Git credential helper for tagging the release
2 parents e9132d7 + af9fa04 commit 35d1f4b

File tree

3 files changed

+31
-20
lines changed

3 files changed

+31
-20
lines changed

.teamcity/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@
7777
<dependencies>
7878
<dependency>
7979
<groupId>org.jetbrains.teamcity</groupId>
80-
<artifactId>configs-dsl-kotlin</artifactId>
80+
<artifactId>configs-dsl-kotlin-latest</artifactId>
8181
<version>${teamcity.dsl.version}</version>
8282
<scope>compile</scope>
8383
</dependency>
8484
<dependency>
8585
<groupId>org.jetbrains.teamcity</groupId>
86-
<artifactId>configs-dsl-kotlin-plugins</artifactId>
86+
<artifactId>configs-dsl-kotlin-plugins-latest</artifactId>
8787
<version>1.0-SNAPSHOT</version>
8888
<type>pom</type>
8989
<scope>compile</scope>

.teamcity/settings.kts

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
import jetbrains.buildServer.configs.kotlin.v2019_2.*
2-
import jetbrains.buildServer.configs.kotlin.v2019_2.BuildTypeSettings.Type.COMPOSITE
3-
import jetbrains.buildServer.configs.kotlin.v2019_2.FailureAction
4-
import jetbrains.buildServer.configs.kotlin.v2019_2.ParameterDisplay.NORMAL
5-
import jetbrains.buildServer.configs.kotlin.v2019_2.ParameterDisplay.PROMPT
6-
import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
7-
import jetbrains.buildServer.configs.kotlin.v2019_2.project
8-
import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.schedule
9-
import jetbrains.buildServer.configs.kotlin.v2019_2.version
1+
import jetbrains.buildServer.configs.kotlin.*
2+
import jetbrains.buildServer.configs.kotlin.buildSteps.script
3+
import jetbrains.buildServer.configs.kotlin.BuildTypeSettings.Type.COMPOSITE
4+
import jetbrains.buildServer.configs.kotlin.FailureAction
5+
import jetbrains.buildServer.configs.kotlin.ParameterDisplay.NORMAL
6+
import jetbrains.buildServer.configs.kotlin.ParameterDisplay.PROMPT
7+
import jetbrains.buildServer.configs.kotlin.buildSteps.gradle
8+
import jetbrains.buildServer.configs.kotlin.project
9+
import jetbrains.buildServer.configs.kotlin.triggers.schedule
10+
import jetbrains.buildServer.configs.kotlin.version
1011

1112
/*
1213
The settings script is an entry point for defining a TeamCity
@@ -30,7 +31,7 @@ To debug in IntelliJ Idea, open the 'Maven Projects' tool window (View
3031
'Debug' option is available in the context menu for the task.
3132
*/
3233

33-
version = "2021.1"
34+
version = "2024.12"
3435

3536
project {
3637
params {
@@ -214,7 +215,7 @@ project {
214215
allowEmpty = false
215216
)
216217
password(
217-
"env.GIT_PASSWORD",
218+
"env.GIT_ACCESS_TOKEN",
218219
"",
219220
label = "GitHub Access Token",
220221
description = "Your personal access token with repo permission",
@@ -226,12 +227,22 @@ project {
226227
password("env.PGP_SIGNING_KEY_PASSPHRASE", "%pgpSigningPassphrase%")
227228
}
228229
steps {
230+
script {
231+
scriptContent = """
232+
git config credential.helper '!f() { sleep 1; echo "username=${'$'}{GIT_USERNAME}"; echo "password=${'$'}{GIT_ACCESS_TOKEN}"; }; f'
233+
""".trimIndent()
234+
}
235+
229236
gradle {
230237
tasks = "clean final -x test"
231238
buildFile = ""
232239
gradleParams =
233240
"-s $useGradleInternalScansServer -Prelease.scope=%releaseScope% %pluginPortalPublishingFlags%"
234241
}
242+
243+
script {
244+
scriptContent = "git config --unset credential.helper"
245+
}
235246
}
236247
dependencies {
237248
snapshot(verifyAllBuildType) {

.teamcity/settings/extensions.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
2-
import jetbrains.buildServer.configs.kotlin.v2019_2.CheckoutMode
3-
import jetbrains.buildServer.configs.kotlin.v2019_2.DslContext
4-
import jetbrains.buildServer.configs.kotlin.v2019_2.ParametrizedWithType
5-
import jetbrains.buildServer.configs.kotlin.v2019_2.Project
6-
import jetbrains.buildServer.configs.kotlin.v2019_2.RelativeId
7-
import jetbrains.buildServer.configs.kotlin.v2019_2.toId
1+
import jetbrains.buildServer.configs.kotlin.BuildType
2+
import jetbrains.buildServer.configs.kotlin.CheckoutMode
3+
import jetbrains.buildServer.configs.kotlin.DslContext
4+
import jetbrains.buildServer.configs.kotlin.ParametrizedWithType
5+
import jetbrains.buildServer.configs.kotlin.Project
6+
import jetbrains.buildServer.configs.kotlin.RelativeId
7+
import jetbrains.buildServer.configs.kotlin.toId
88

99
fun BuildType.agentRequirement(os: Os) {
1010
requirements {

0 commit comments

Comments
 (0)