more release version automationv0.13.18

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

1 files changed, 29 insertions, 31 deletions

diff --git a/draw.go b/draw.go
index f6a2087..9064454 100644
--- a/draw.go
+++ b/draw.go
@@ -134,6 +134,7 @@ func (rs *RepoStatus) drawGitStatus() {
 	rs.dirtyLabel = gadgets.NewOneLiner(newgrid, "dirty")
 	rs.readOnly = gadgets.NewOneLiner(newgrid, "read only")
 	rs.goSumStatus = gadgets.NewOneLiner(newgrid, "go mod status")
+	rs.targetReleaseVersion = gadgets.NewOneLiner(newgrid, "target release version")
 
 	rs.speed = gadgets.NewOneLiner(newgrid, "refresh speed =")
 	rs.speedActual = gadgets.NewOneLiner(newgrid, "speed actual =")
@@ -161,6 +162,24 @@ func (rs *RepoStatus) runDevelMergeB() bool {
 	return true
 }
 
+func (rs *RepoStatus) runReleaseVersionB() bool {
+	if !rs.generateCmd() {
+		log.Warn("something is wrong. fix the errors first")
+		return false
+	}
+	rs.releaseVersion.Disable()
+	log.Warn("MAKING A RELEASE AND VERSION")
+	if !rs.runGitCommands(true) {
+		log.Warn("SOMETHING WENT WRONG")
+		rs.Update()
+		rs.Enable()
+		return false
+	}
+	log.Warn("THINGS SEEM OK. runReleaseVersionB worked. Release is finished. restart autotypist()")
+	rs.Hide()
+	return true
+}
+
 func (rs *RepoStatus) runFullAutomation() bool {
 	if ! rs.runDevelMergeB() {
 		log.Warn("THINGS FAILED returned false")
@@ -180,6 +199,13 @@ func (rs *RepoStatus) runFullAutomation() bool {
 		log.Warn("THINGS SEEM OK ready to release")
 		if rs.releaseVersion.String() == "Release!" {
 			log.Warn("releaseVersion == 'Release!'. safe to do release version HERE?")
+			log.Warn("rs.newversion =", rs.newversion.String())
+			log.Warn("rs.targetReleaseVersion =", rs.targetReleaseVersion.String())
+			log.Warn("Are these equal?")
+			if rs.newversion.String() == rs.targetReleaseVersion.String() {
+				log.Warn("THEY ARE EQUAL!")
+				// rs.runReleaseVersionB()
+			}
 		}
 	}
 	return true
@@ -233,41 +259,11 @@ func (rs *RepoStatus) drawGitCommands() {
 			log.Warn("THINGS FAILED fullAutomation() returned false")
 		}
 		rs.Enable()
-
-		/*
-		rs.Disable()
-		master := rs.mainWorkingName.String()
-		log.Warn("develMerge() checking out master branch", master)
-		rs.checkoutBranch("master", master)
-		if rs.getCurrentBranchName() != master {
-			log.Warn("something went wrong switching to the master branch. full stop!")
-			return
-		}
-		log.Warn("develMerge() running runGitCommands()")
-		if !rs.runGitCommands(true) {
-			log.Warn("SOMETHING WENT WRONG")
-			return
-		}
-		rs.Update()
-		rs.Enable()
-		log.Warn("THINGS SEEM OK runGitCommands() returned true")
-		*/
 	})
 
 	rs.releaseVersion = newgrid.NewButton("tag and release new version", func() {
 		rs.Disable()
-		if !rs.generateCmd() {
-			log.Warn("something is wrong. fix the errors first")
-			return
-		}
-		rs.releaseVersion.Disable()
-		log.Warn("MAKING A RELEASE AND VERSION")
-		if !rs.runGitCommands(true) {
-			log.Warn("SOMETHING WENT WRONG")
-		}
-		rs.Update()
-		rs.Enable()
-		log.Warn("THINGS SEEM OK")
+		rs.runReleaseVersionB()
 	})
 
 	newgrid.Margin()
@@ -289,6 +285,8 @@ func (rs *RepoStatus) SetVersion(a, b, c string, reason string) {
 	releaseRevision = c
 	rs.setRevision(c)
 
+	rs.targetReleaseVersion.SetText(a + "." + b + "." + c)
+
 	rs.versionMessage.SetLabel(reason)
 	rs.versionMessage.SetText(reason)
 	// rs.versionMessage.SetValue(reason)