Skip to content

Commit 90dd774

Browse files
Add support of other env names for artifactory logins (#71)
According to the [gradle-build action](https://github.com/SonarSource/ci-github-actions/blob/master/build-gradle/action.yml#L160), those are the names available for the github action.
1 parent 504714c commit 90dd774

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

  • gradle-modules/src/main/kotlin/org/sonarsource/cloudnative/gradle

gradle-modules/src/main/kotlin/org/sonarsource/cloudnative/gradle/BuildUtils.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,10 @@ internal fun RepositoryHandler.repox(
4949

5050
// This authentication relies on env vars configured on Cirrus CI or on Gradle properties (`-P<prop>` flags or `gradle.properties` file)
5151
val artifactoryUsername = providers.environmentVariable("ARTIFACTORY_PRIVATE_USERNAME")
52+
.orElse(providers.environmentVariable("ARTIFACTORY_USERNAME"))
5253
.orElse(providers.gradleProperty("artifactoryUsername"))
5354
val artifactoryPassword = providers.environmentVariable("ARTIFACTORY_PRIVATE_PASSWORD")
55+
.orElse(providers.environmentVariable("ARTIFACTORY_ACCESS_TOKEN"))
5456
.orElse(providers.gradleProperty("artifactoryPassword"))
5557

5658
if (artifactoryUsername.isPresent && artifactoryPassword.isPresent) {

0 commit comments

Comments
 (0)