#806 | project.version set when updateProjectVersionAfterRelease flag…

… is enabled
allegro · Sep 2, 2024 · c8ddf6b · c8ddf6b
1 parent 4d80f09
commit c8ddf6b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/src/main/groovy/pl/allegro/tech/build/axion/release/ReleasePlugin.groovy b/src/main/groovy/pl/allegro/tech/build/axion/release/ReleasePlugin.groovy
@@ -42,10 +42,8 @@ abstract class ReleasePlugin implements Plugin<Project> {
             description = 'Performs release - creates tag and pushes it to remote.'
             dependsOn(VERIFY_RELEASE_TASK)
             if (versionConfig.updateProjectVersionAfterRelease.get()) {
-                println("Project version will be updated after release.")
+                project.logger.quiet("Project version will be updated after release.")
                 finalizedBy(project.tasks.assemble)
-            } else {
-                println("Project version will not be updated after release.")
             }
         }
 
@@ -54,10 +52,8 @@ abstract class ReleasePlugin implements Plugin<Project> {
             description = 'Performs first stage of release - creates tag.'
             dependsOn(VERIFY_RELEASE_TASK)
             if (versionConfig.updateProjectVersionAfterRelease.get()) {
-                println("Project version will be updated after release.")
+                project.logger.quiet("Project version will be updated after release.")
                 finalizedBy(project.tasks.assemble)
-            } else {
-                println("Project version will not be updated after release.")
             }
         }
 

diff --git a/src/main/groovy/pl/allegro/tech/build/axion/release/ReleaseTask.groovy b/src/main/groovy/pl/allegro/tech/build/axion/release/ReleaseTask.groovy
@@ -34,8 +34,11 @@ abstract class ReleaseTask extends BaseAxionTask {
             throw new ReleaseFailedException("Status: ${status}\nMessage: ${message}")
         }
 
-        if (result.outcome === ScmPushResultOutcome.SUCCESS) {
+        if (versionConfig.updateProjectVersionAfterRelease().get()) {
             project.version = versionConfig.uncached.decoratedVersion
+        }
+
+        if (result.outcome === ScmPushResultOutcome.SUCCESS) {
             if (System.getenv().containsKey('GITHUB_ACTIONS')) {
                 Files.write(
                     Paths.get(System.getenv('GITHUB_OUTPUT')),