testing gov0.16.0

Signed-off-by: Jeff Carr <[email protected]>

1 files changed, 14 insertions, 5 deletions

diff --git a/draw.go b/draw.go
index c41e2e0..134eec0 100644
--- a/draw.go
+++ b/draw.go
@@ -181,7 +181,7 @@ func (rs *RepoStatus) runReleaseVersionB() bool {
 }
 
 func (rs *RepoStatus) runFullAutomation() bool {
-	if ! rs.runDevelMergeB() {
+	if !rs.runDevelMergeB() {
 		log.Warn("THINGS FAILED returned false")
 		return false
 	}
@@ -190,7 +190,7 @@ func (rs *RepoStatus) runFullAutomation() bool {
 	label := "merge devel into " + rs.GetMasterBranchName()
 	if label == rs.develMerge.String() {
 		log.Warn("LABELS MATCH", label, rs.develMerge.String())
-		if ! rs.runDevelMergeB() {
+		if !rs.runDevelMergeB() {
 			log.Warn("THINGS FAILED returned false")
 			return false
 		}
@@ -273,6 +273,7 @@ func (rs *RepoStatus) drawGitCommands() {
 }
 
 var releaseRevision string = ""
+
 // over ride the computation of this if a release is being created
 func (rs *RepoStatus) setRevision(c string) {
 	if releaseRevision == "" {
@@ -354,9 +355,17 @@ func (rs *RepoStatus) setTag() bool {
 func (rs *RepoStatus) incrementVersion() {
 	lasttag := rs.lasttag.String()
 	var major, minor, revision string
-	major, minor, revision = splitVersion(lasttag)
-	log.Warn("Should release version here", lasttag)
-	log.Log(INFO, "Should release a,b,c", major, minor, revision)
+	if rs.targetReleaseVersion.String() == "" {
+		major, minor, revision = splitVersion(lasttag)
+		log.Warn("Should release version here", lasttag)
+		log.Log(INFO, "Should release a,b,c", major, minor, revision)
+	} else {
+		// this means there is a specific release version trying to be done
+		// use the target release version instead
+		major, minor, revision = splitVersion(rs.targetReleaseVersion.String())
+		log.Warn("Should release version here", lasttag)
+		log.Log(INFO, "Should release a,b,c", major, minor, revision)
+	}
 
 	a, _ := strconv.Atoi(major)
 	b, _ := strconv.Atoi(minor)