From 034b42f3a1fc3a6d5aa83871af60b641ac92dc9a Mon Sep 17 00:00:00 2001
From: Marco Belladelli <marcobladel@gmail.com>
Date: Thu, 18 Apr 2024 12:42:37 +0200
Subject: [PATCH] Tag release version before committing development version
 change

---
 release/release.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/release/release.gradle b/release/release.gradle
index 5a1b715c1162..1c3b06ccfa6a 100644
--- a/release/release.gradle
+++ b/release/release.gradle
@@ -322,14 +322,14 @@ def releasePreparePostGitTask = tasks.register( 'gitTasksAfterRelease' ) {
     dependsOn changeToDevelopmentVersionTask
 
     doLast {
-        logger.lifecycle( "Performing pre-steps Git commit : `${project.releaseVersion}`" )
-        executeGitCommand( 'add', '.' )
-        executeGitCommand( 'commit', '-m', "Post-steps for release : `${project.ormVersion.fullName}`" )
-
         if ( project.createTag ) {
             logger.lifecycle( "Tagging release : `${project.releaseTag}`..." )
             executeGitCommand( 'tag', '-a', project.releaseTag, '-m', "Release $project.ormVersion.fullName" )
         }
+
+        logger.lifecycle( "Performing post-steps Git commit : `${project.releaseVersion}`" )
+        executeGitCommand( 'add', '.' )
+        executeGitCommand( 'commit', '-m', "Post-steps for release : `${project.ormVersion.fullName}`" )
     }
 }