From afc8f0be4fee3fdad01ed535e4fd0490a707bc40 Mon Sep 17 00:00:00 2001 From: David Hiendl Date: Thu, 27 Oct 2022 11:20:55 +0200 Subject: [PATCH] gradle/giteaMavenRepo.gradle correct token function argument, also check env var GITEA_BUILD_TOKEN --- gradle/GiteaMavenRepo.gradle | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gradle/GiteaMavenRepo.gradle b/gradle/GiteaMavenRepo.gradle index 294ebaf..5dd0c64 100644 --- a/gradle/GiteaMavenRepo.gradle +++ b/gradle/GiteaMavenRepo.gradle @@ -17,6 +17,7 @@ def addGiteaPublishingRepository(RepositoryHandler handler, String giteaApiUrl, /** * Add auth to repo, attempt to find token by first non-null: * - function argument "token" + * - env var: GITEA_BUILD_TOKEN * - env var: CI_JOB_TOKEN * - env var: CI_REGISTRY_PASSWORD * - gradle project var: giteaPrivateToken @@ -27,7 +28,12 @@ def setGiteaRepoAuth(MavenArtifactRepository maven, String token = null) { if (token != null) { maven.credentials(HttpHeaderCredentials) { name = 'Authorization' - value = "token " + System.getenv("CI_JOB_TOKEN") + value = "token " + token + } + } else if (System.getenv("GITEA_BUILD_TOKEN") != null) { + maven.credentials(HttpHeaderCredentials) { + name = 'Authorization' + value = "token " + System.getenv("GITEA_BUILD_TOKEN") } } else if (System.getenv("CI_JOB_TOKEN") != null) { maven.credentials(HttpHeaderCredentials) {