Skip to content

Commit f865fa5

Browse files
committed
[hibernate#2027] Use env-vars for passing secrets used during release
1 parent 5df6c58 commit f865fa5

File tree

1 file changed

+38
-3
lines changed

1 file changed

+38
-3
lines changed

publish.gradle

+38-3
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,9 @@ gradle.taskGraph.whenReady { TaskExecutionGraph graph ->
104104
}
105105

106106
if ( wasPublishingRequested ) {
107-
def ossrhUser = System.getenv().get( "ORG_GRADLE_PROJECT_sonatypeUsername" )
108-
def ossrhPass = System.getenv().get( "ORG_GRADLE_PROJECT_sonatypePassword" )
109-
if ( ossrhUser == null || ossrhPass == null ) {
107+
def publishUser = resolvePublishUser()
108+
def publishPass = resolvePublishPass()
109+
if ( publishUser == null || publishPass == null ) {
110110
throw new RuntimeException( "Cannot perform publishing to OSSRH without credentials." )
111111
}
112112
logger.lifecycle "Publishing groupId: '" + project.group + "', version: '" + project.version + "'"
@@ -131,6 +131,41 @@ gradle.taskGraph.whenReady { TaskExecutionGraph graph ->
131131
}
132132
}
133133

134+
String resolvePublishUser() {
135+
var envVar = System.getenv().get( "ORG_GRADLE_PROJECT_sonatypeUsername" )
136+
if ( envVar != null ) {
137+
return envVar
138+
}
139+
140+
def projectProp = projectPropOrNull( "sonatypeUsername" )
141+
if ( projectProp != null ) {
142+
return projectProp
143+
}
144+
145+
return null
146+
}
147+
148+
String resolvePublishPass() {
149+
var envVar = System.getenv().get( "ORG_GRADLE_PROJECT_sonatypePassword" )
150+
if ( envVar != null ) {
151+
return envVar
152+
}
153+
154+
def projectProp = projectPropOrNull( "sonatypePassword" )
155+
if ( projectProp != null ) {
156+
return projectProp
157+
}
158+
159+
return null
160+
}
161+
162+
String projectPropOrNull(String name) {
163+
if ( project.hasProperty( name ) ) {
164+
return project.findProperty( name )
165+
}
166+
return null;
167+
}
168+
134169

135170
static String resolveSigningKey() {
136171
var key = System.getenv().get( "SIGNING_GPG_PRIVATE_KEY" )

0 commit comments

Comments
 (0)