Skip to content

Commit e002923

Browse files
authored
Try using .vars and rename for jreleaser (#184)
* Try using .vars and rename for jreleaser * Use jreleaser specific env variables * Use jreleaser specific env variables --------- Signed-off-by: Matthew Burkert <[email protected]>
1 parent 3c2cb60 commit e002923

File tree

2 files changed

+8
-23
lines changed

2 files changed

+8
-23
lines changed

.github/workflows/release.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ jobs:
4141
run: ./gradlew jreleaserFullRelease -Dorg.gradle.daemon=false --stacktrace -x test -x integrationTest
4242
env:
4343
JRELEASER_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
44-
GPG_PUBLIC_KEY: ${{ env.GPG_PUBLIC_KEY }}
45-
GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }}
46-
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
44+
JRELEASER_GPG_PUBLIC_KEY: ${{ vars.GPG_PUBLIC_KEY }}
45+
JRELEASER_GPG_SECRET_KEY: ${{ secrets.GPG_SIGNING_KEY }}
46+
JRELEASER_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
4747
JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.JRELEASER_MAVENCENTRAL_USERNAME }}
4848
JRELEASER_MAVENCENTRAL_PASSWORD: ${{ secrets.JRELEASER_MAVENCENTRAL_PASSWORD }}
4949

build.gradle

+5-20
Original file line numberDiff line numberDiff line change
@@ -156,10 +156,10 @@ jreleaser {
156156
signing {
157157
active = 'ALWAYS'
158158
armored = true
159-
def publicKey = System.getenv('GPG_PUBLIC_KEY')?.decodeBase64() ?
160-
new String(System.getenv('GPG_PUBLIC_KEY').decodeBase64()) : ''
161-
def secretKey = System.getenv('GPG_SIGNING_KEY')?.decodeBase64() ?
162-
new String(System.getenv('GPG_SIGNING_KEY').decodeBase64()) : ''
159+
def publicKey = System.getenv('JRELEASER_GPG_PUBLIC_KEY')?.decodeBase64() ?
160+
new String(System.getenv('JRELEASER_GPG_PUBLIC_KEY').decodeBase64()) : ''
161+
def secretKey = System.getenv('JRELEASER_GPG_SECRET_KEY')?.decodeBase64() ?
162+
new String(System.getenv('JRELEASER_GPG_SECRET_KEY').decodeBase64()) : ''
163163

164164
if (publicKey) {
165165
System.setProperty('jreleaser.gpg.public.key', publicKey)
@@ -168,28 +168,13 @@ jreleaser {
168168
System.setProperty('jreleaser.gpg.secret.key', secretKey)
169169
}
170170

171-
def passphrase = System.getenv('GPG_PASSPHRASE')
172-
if (passphrase) {
173-
System.setProperty('jreleaser.gpg.passphrase', passphrase)
174-
}
175171
}
176172
deploy {
177173
maven {
178174
mavenCentral {
179175
sonatype {
180176
active = 'ALWAYS'
181177
url = 'https://central.sonatype.com/api/v1/publisher'
182-
def sonatype_user = System.getenv('JRELEASER_MAVENCENTRAL_USERNAME')
183-
def sonatype_pass = System.getenv('JRELEASER_MAVENCENTRAL_PASSWORD')
184-
if (sonatype_user) {
185-
System.setProperty('jreleaser.mavencentral.username', sonatype_user)
186-
}
187-
if (sonatype_pass) {
188-
System.setProperty('jreleaser.mavencentral.password', sonatype_pass)
189-
}
190-
if (!sonatype_user || !sonatype_pass) {
191-
logger.warn('Sonatype credentials are missing. This may cause deployment issues.')
192-
}
193178
verifyPom = false
194179
stagingRepository('build/staging-deploy')
195180
}
@@ -199,4 +184,4 @@ jreleaser {
199184
}
200185

201186
afterReleaseBuild.dependsOn publish
202-
publish.finalizedBy publishPlugins
187+
// publish.finalizedBy publishPlugins

0 commit comments

Comments
 (0)