Improve release #656

codecholeric · web-flow · commit 2935dfad959f · 2021-08-22T23:50:15.000+07:00
There were still some minor nuisances in the script:

* the error output of `git checkout` was swallowed
* the version was updated before the branch was switched

This should be fixed now.
diff --git a/build-steps/release/publish.gradle b/build-steps/release/publish.gradle
@@ -126,26 +126,34 @@ def updateVersion = { Closure<String> calculateNewVersion ->
 
 def executeCommand = { String command ->
     new StringBuilder().with { output ->
-        command.split(' ').execute().with { it.consumeProcessOutputStream(output); it }.waitFor()
+        def error = new StringBuilder()
+        def exitCode = command.split(' ').execute()
+            .with {
+                it.consumeProcessOutputStream(output)
+                it.consumeProcessErrorStream(error)
+                it
+            }.waitFor()
+        assert exitCode == 0: "Command '$command' failed with exit code $exitCode: $error"
         output.toString().trim()
     }
 }
 
 task prepareRelease() {
     doFirst {
-        updateVersion { int oldMajor, int oldMinor, int oldPatch, String oldSuffix -> "$oldMajor.$oldMinor.$oldPatch" }
+        String releaseVersion = withCurrentVersion { int oldMajor, int oldMinor, int oldPatch, String oldSuffix -> "$oldMajor.$oldMinor.$oldPatch" }
 
-        String currentVersion = getCurrentVersion()
-        def releaseBranch = "release-$currentVersion"
+        def releaseBranch = "release-$releaseVersion"
         executeCommand("git checkout -b $releaseBranch")
         String currentBranch = executeCommand('git rev-parse --abbrev-ref HEAD')
         assert currentBranch == releaseBranch: "Mismatch: Should be on branch $releaseBranch but current branch is $currentBranch"
 
+        updateVersion { major, minor, patch, suffix -> releaseVersion }
+
         String lastReleaseVersion = getLastReleaseVersion()
         ['README.md', 'docs/_data/navigation.yml', 'docs/_pages/getting-started.md'].each {
             new File(project.rootDir, it).with { file ->
-                println "Replacing last release version $lastReleaseVersion by $currentVersion in file ${file.absolutePath}"
-                file.text = file.text.replaceAll(lastReleaseVersion, currentVersion)
+                println "Replacing last release version $lastReleaseVersion by $releaseVersion in file ${file.absolutePath}"
+                file.text = file.text.replaceAll(lastReleaseVersion, releaseVersion)
             }
         }
     }
