more release automation

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

1 files changed, 42 insertions, 1 deletions

diff --git a/draw.go b/draw.go
index a8c21d1..749654e 100644
--- a/draw.go
+++ b/draw.go
@@ -143,6 +143,37 @@ func (rs *RepoStatus) SetGoSumStatus(s string) {
 	rs.goSumStatus.SetText(s)
 }
 
+func (rs *RepoStatus) runDevelMergeB() bool {
+	master := rs.mainWorkingName.String()
+	log.Warn("runDevelMergeB() checking out master branch", master)
+	rs.checkoutBranch("master", master)
+	if rs.getCurrentBranchName() != master {
+		log.Warn("runDevelMergeB() something went wrong switching to the master branch. full stop!")
+		return false
+	}
+	log.Warn("runDevelMergeB() running runGitCommands()")
+	if !rs.runGitCommands(true) {
+		log.Warn("runDevelMergeB() SOMETHING WENT WRONG")
+		return false
+	}
+	rs.Update()
+	log.Warn("runDevelMergeB() THINGS SEEM OK runGitCommands() returned true.")
+	return true
+}
+
+func (rs *RepoStatus) runFullAutomation() bool {
+	if ! rs.runDevelMergeB() {
+		log.Warn("THINGS FAILED returned false")
+		return false
+	}
+	log.Warn("THINGS SEEM OK returned true. can run this again?")
+	log.Warn("develMerge =", rs.develMerge.String())
+	if rs.develMerge.String() == "ready to release" {
+		log.Warn("THINGS SEEM OK ready to release")
+	}
+	return true
+}
+
 func (rs *RepoStatus) drawGitCommands() {
 	rs.gitCommandsGroup = rs.window.Box().NewGroup("git commands")
 	newgrid := rs.gitCommandsGroup.NewGrid("gridnuts", 2, 2)
@@ -185,6 +216,15 @@ func (rs *RepoStatus) drawGitCommands() {
 	label := "merge " + rs.mainWorkingName.String() + " to devel"
 	rs.develMerge = newgrid.NewButton(label, func() {
 		rs.Disable()
+		if rs.runFullAutomation() {
+			log.Warn("THINGS SEEM OK fullAutomation() returned true.")
+		} else {
+			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)
@@ -199,7 +239,8 @@ func (rs *RepoStatus) drawGitCommands() {
 		}
 		rs.Update()
 		rs.Enable()
-		log.Warn("THINGS SEEM OK")
+		log.Warn("THINGS SEEM OK runGitCommands() returned true")
+		*/
 	})
 
 	rs.releaseVersion = newgrid.NewButton("tag and release new version", func() {