diff --git a/.woodpecker.yml b/.woodpecker.yml index bf59575..e260e23 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -46,7 +46,7 @@ pipeline: - gradle --build-cache build :launcher-dist:publish -Pflavor=windows -Pdist.platformOnly -Ppublic -Ptimestamp=${CI_PIPELINE_STARTED} - gradle --build-cache build :launcher-dist:publish -Pflavor=linux -Pdist.platformOnly -Ppublic -Ptimestamp=${CI_PIPELINE_STARTED} - gradle --build-cache build :launcher-dist:publish -Pflavor=macos -Pdist.platformOnly -Ppublic -Ptimestamp=${CI_PIPELINE_STARTED} - secrets: [ maven_token ] + secrets: [ maven_token, maven_name ] when: - branch: master publish_release: @@ -61,7 +61,7 @@ pipeline: - gradle --build-cache build :launcher-dist:publish -Pflavor=windows -Pdist.platformOnly -Ppublic -Prelease - gradle --build-cache build :launcher-dist:publish -Pflavor=linux -Pdist.platformOnly -Ppublic -Prelease - gradle --build-cache build :launcher-dist:publish -Pflavor=macos -Pdist.platformOnly -Ppublic -Prelease - secrets: [ maven_token ] + secrets: [ maven_token, maven_name ] when: - event: tag branch: master diff --git a/buildSrc/src/main/kotlin/inceptum.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/inceptum.java-conventions.gradle.kts index 4e98005..3e2813f 100644 --- a/buildSrc/src/main/kotlin/inceptum.java-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/inceptum.java-conventions.gradle.kts @@ -14,20 +14,20 @@ dependencies { publishing { repositories { - if (rootProject.extra["isPublic"] == true) { - maven { - url = uri("https://git.frohnmeyer-wds.de/api/packages/JfMods/maven") - name = "gitea" + mavenLocal() - credentials(HttpHeaderCredentials::class) { - name = "Authorization" - value = System.getenv()["MAVEN_TOKEN"] + if (rootProject.extra["isPublic"] == true) { + maven("https://maven.frohnmeyer-wds.de/artifacts") { + name = "public" + + credentials(PasswordCredentials::class) { + username = System.getenv()["MAVEN_NAME"] + password = System.getenv()["MAVEN_TOKEN"] } authentication { - create("header") + create("basic") } } } - mavenLocal() } } \ No newline at end of file