From 65c204bcb5222c7be1d5aed70288673390f830ae Mon Sep 17 00:00:00 2001
From: Maximilian Hill <mhill@inett.de>
Date: Thu, 16 Dec 2021 11:11:53 +0100
Subject: [PATCH] fix versioning of mkp

---
 Jenkinsfile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ce0822c..4b78d24 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -63,14 +63,14 @@ node {
                     }
 
                     def releaseVersion
-                    if (containsTag != "") {
+                    if (lastTag == "") {
+                        releaseVersion = shortCommit
+                    } else {
                         if (longCommit == longTagCommit) {
-                            releaseVersion = containsTag + "+" + shortCommit
+                            releaseVersion = lastTag
                         } else {
-                            releaseVersion = containsTag
+                            releaseVersion = lastTag + "+" + shortCommit
                         }
-                    } else {
-                         releaseVersion = shortCommit
                     }
                     sh "build/update-version ${releaseVersion}"
                     sh 'build/mkp-pack'