jesus. what a slow slogv0.23.7

1 files changed, 32 insertions, 28 deletions

diff --git a/prepareRelease.go b/prepareRelease.go
index 050af38..463a472 100644
--- a/prepareRelease.go
+++ b/prepareRelease.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"go.wit.com/lib/protobuf/forgepb"
 	"go.wit.com/lib/protobuf/gitpb"
 	"go.wit.com/log"
 )
@@ -19,6 +20,37 @@ func makePrepareRelease() {
 		log.Info("setAllBranchesToMaster() failed")
 	}
 
+	// run this each time something gets published successfully
+	rePrepareRelease()
+
+	if findNext() {
+		log.Info("prepare release findNext() returned true")
+	}
+
+	me.release.box.Enable()
+}
+
+func forceReleaseVersion(repo *gitpb.Repo) {
+	if argv.Minor {
+		// if v1.2.3 change to v.1.3.0
+		repo.IncrementTargetMinor()
+	} else {
+		// if v1.2.3 change to v.1.2.4
+		repo.IncrementTargetRevision()
+	}
+	// empty git notes
+	repo.Run([]string{"git", "notes", "remove"})
+
+	if !runGoClean(repo) {
+		log.Info("go-mod-clean probably failed here. that's ok", repo.GetGoPath())
+	}
+}
+
+func rePrepareRelease() {
+	// reload the config
+	me.forge = forgepb.Init()
+	me.found = new(gitpb.Repos)
+
 	// blank all the target versions incase they were saved in the config .pb file
 	all := me.forge.Repos.SortByFullPath()
 	for all.Scan() {
@@ -68,32 +100,4 @@ func makePrepareRelease() {
 
 	}
 	me.forge.ConfigSave()
-	if findNext() {
-		log.Info("prepare release findNext() returned true")
-		me.release.box.Enable()
-	} else {
-		log.Info("prepare release findNext() returned false")
-		if findNext() {
-			log.Info("prepare release findNext() returned true")
-			me.release.box.Enable()
-		} else {
-			log.Info("prepare release findNext() returned false")
-		}
-	}
-}
-
-func forceReleaseVersion(repo *gitpb.Repo) {
-	if argv.Minor {
-		// if v1.2.3 change to v.1.3.0
-		repo.IncrementTargetMinor()
-	} else {
-		// if v1.2.3 change to v.1.2.4
-		repo.IncrementTargetRevision()
-	}
-	// empty git notes
-	repo.Run([]string{"git", "notes", "remove"})
-
-	if !runGoClean(repo) {
-		log.Info("go-mod-clean probably failed here. that's ok", repo.GetGoPath())
-	}
 }