Skip to content

Commit e26290b

Browse files
Fix environment variables propagation in signing and release publishing (#77)
WiP for release automation. My template didn't work, trying to get it fixed in terms of environment propagation. Looks like signing also does not get applied tho
1 parent 8d97e05 commit e26290b

File tree

1 file changed

+8
-23
lines changed

1 file changed

+8
-23
lines changed

build.gradle

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ plugins {
1414
id 'com.diffplug.spotless' version '6.22.0'
1515
id 'com.palantir.git-version' version '3.0.0'
1616
id 'com.github.johnrengelman.shadow' version '8.1.1'
17-
id 'io.github.gradle-nexus.publish-plugin' version "1.0.0"
17+
id 'io.github.gradle-nexus.publish-plugin' version "1.1.0"
1818
}
1919

2020
wrapper {
@@ -86,17 +86,11 @@ signing {
8686
required {
8787
!version.toString().contains("SNAPSHOT") && (gradle.taskGraph.hasTask("uploadArchives") || gradle.taskGraph.hasTask("publish"))
8888
}
89-
def signingKey = providers
90-
.environmentVariable("OSSRH_GPG_SECRET_KEY")
91-
.forUseAtConfigurationTime()
92-
def signingPassphrase = providers
93-
.environmentVariable("OSSRH_GPG_SECRET_KEY_PASSWORD")
94-
.forUseAtConfigurationTime()
95-
if (signingKey.present && signingPassphrase.present) {
96-
useInMemoryPgpKeys(signingKey.get(), signingPassphrase.get())
97-
def extension = extensions.getByName("publishing") as PublishingExtension
98-
sign(extension.publications)
99-
}
89+
def signingKey = providers.environmentVariable("OSSRH_GPG_SECRET_KEY").get()
90+
def signingPassphrase = providers.environmentVariable("OSSRH_GPG_SECRET_KEY_PASSWORD").get()
91+
useInMemoryPgpKeys(signingKey, signingPassphrase)
92+
def extension = extensions.getByName("publishing") as PublishingExtension
93+
sign(extension.publications)
10094
}
10195

10296
publishing {
@@ -243,17 +237,8 @@ nexusPublishing {
243237
sonatype {
244238
nexusUrl = uri("https://oss.sonatype.org/service/local/")
245239
snapshotRepositoryUrl = uri("https://oss.sonatype.org/content/repositories/snapshots/")
246-
247-
def ossrhUsername = providers
248-
.environmentVariable("OSSRH_USERNAME")
249-
.forUseAtConfigurationTime()
250-
def ossrhPassword = providers
251-
.environmentVariable("OSSRH_TOKEN")
252-
.forUseAtConfigurationTime()
253-
if (ossrhUsername.present && ossrhPassword.present) {
254-
username = ossrhUsername.get()
255-
password = ossrhPassword.get()
256-
}
240+
username = providers.environmentVariable("OSSRH_USERNAME").get()
241+
password = providers.environmentVariable("OSSRH_TOKEN").get()
257242
}
258243
}
259244
}

0 commit comments

Comments
 (0)