Merge pull request #860 from IETS3/merge/mps20213

Merge maintenance/mps20213 into maintenance/mps20222
IETS3 · Mar 19, 2024 · 179e90f · 179e90f
2 parents b8f891b + 44977ac
commit 179e90f
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/build.gradle b/build.gradle
@@ -82,8 +82,11 @@ if (project.hasProperty('iets3OpenSourceVersion')) {
         currentBranch = GitBasedVersioning.gitBranch
 
         def buildNumber = System.env.BUILD_NUMBER.toInteger()
-        if (currentBranch.startsWith("maintenance/") || currentBranch.startsWith("datev/")) {
+        if (currentBranch.startsWith("maintenance-")) {
             version = "$major.$minor.$buildNumber.${GitBasedVersioning.gitShortCommitHash}"
+        } else if (currentBranch.startsWith("datev-loon-staging-") || currentBranch.startsWith("datev-steuer-staging-")){
+            // branch name will be part of the version
+            version = GitBasedVersioning.getVersionWithCount(major, minor, buildNumber)
         } else {
             version = GitBasedVersioning.getVersionWithCount(major, minor, buildNumber) + "-SNAPSHOT"
         }