Merge pull request #99 from boxboat/bugfix/prepare-promotions-tag-prefix

Properly handle gitTagPrefix in preparePromotions method
boxboat · Dec 4, 2023 · 4054e5d · 4054e5d
2 parents 1b6afd2 + 59352b2
commit 4054e5d
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/com/boxboat/jenkins/pipeline/promote/BoxPromote.groovy b/src/com/boxboat/jenkins/pipeline/promote/BoxPromote.groovy
@@ -370,9 +370,17 @@ class BoxPromote extends BoxBase<PromoteConfig> implements Serializable {
         setVersionChange(gitCommitToTag, gitTagToTag)
 
         if (gitCommitToTag) {
-            commits = gitRepo.getCommitsBetween(nextSemVer.getPreviousVersion(), gitCommitToTag)
+            if (config.gitTagPrefix) {
+                commits = gitRepo.getCommitsBetween("${config.gitTagPrefix}${nextSemVer.getPreviousVersion()}", gitCommitToTag)
+            } else {
+                commits = gitRepo.getCommitsBetween(nextSemVer.getPreviousVersion(), gitCommitToTag)
+            }
         } else if (gitTagToTag) {
-            commits = gitRepo.getCommitsBetween(nextSemVer.getPreviousVersion(), gitTagToTag)
+            if (config.gitTagPrefix) {
+                commits = gitRepo.getCommitsBetween("${config.gitTagPrefix}${nextSemVer.getPreviousVersion()}", "${config.gitTagPrefix}${gitTagToTag}")
+            } else {
+                commits = gitRepo.getCommitsBetween(nextSemVer.getPreviousVersion(), gitTagToTag)
+            }
         }
     }