Skip to content

Commit 9304ff0

Browse files
committed
HHH-17239 Automate maintenance releases
1 parent 1a8e9f3 commit 9304ff0

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

gradle/releasable.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
apply from: rootProject.file( 'gradle/base-information.gradle' )
22

33
task release {
4-
dependsOn ':release:releaseChecks'
54
mustRunAfter ':release:releaseChecks'
65
enabled !project.ormVersion.isSnapshot
76
}

release/release.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,14 +229,14 @@ def releaseChecksTask = tasks.register( "releaseChecks" ) {
229229
gitBranchLocal = project.property('gitBranch')
230230
}
231231
else {
232-
gitBranchLocal = executeGitCommand( 'branch', '--show-current' )
232+
gitBranchLocal = executeGitCommand( 'branch', '--show-current' ).trim()
233233
}
234234

235235
if (project.hasProperty('gitRemote')) {
236236
gitRemoteLocal = project.property('gitRemote')
237237
}
238238
else {
239-
final String remotes = executeGitCommand( 'remote', 'show' )
239+
final String remotes = executeGitCommand( 'remote', 'show' ).trim()
240240
final List<String> tokens = remotes.tokenize()
241241
if ( tokens.size() != 1 ) {
242242
throw new GradleException( "Could not determine `gitRemote` property for `releaseChecks` tasks." )
@@ -263,7 +263,7 @@ def releaseChecksTask = tasks.register( "releaseChecks" ) {
263263
}
264264
}
265265

266-
def preVerifyReleaseTask = tasks.register( "preVerifyRelease" ){
266+
def preVerifyReleaseTask = tasks.register( "preVerifyRelease" ) {
267267
group 'Release'
268268
description 'Pre-verifies a release job execution (Run locally before a CI release)'
269269

0 commit comments

Comments
 (0)