almost automated againv0.22.27

1 files changed, 10 insertions, 9 deletions

diff --git a/makePrepareRelease.go b/makePrepareRelease.go
index 9832116..b7a4cab 100644
--- a/makePrepareRelease.go
+++ b/makePrepareRelease.go
@@ -11,6 +11,15 @@ func makePrepareRelease() {
 	me.release.box.Disable()
 	defer me.Enable()
 
+	if setAllBranchesToMaster() {
+		// if it succeeds, disable this button
+		me.setBranchesToMasterB.Disable()
+		me.release.box.Enable()
+		PrintReleaseReport("", "")
+	} else {
+		log.Info("setAllBranchesToMaster() failed")
+	}
+
 	// first reset all the target versions back to the current version
 	// incase there was a partial release process running that
 	// did not finish
@@ -65,7 +74,7 @@ func makePrepareRelease() {
 				log.Info("arg final check true", check.GetGoPath())
 			} else {
 				log.Info("arg final check false", check.GetGoPath())
-				os.Exit(-1)
+				// os.Exit(-1)
 			}
 			// see if there is a new version
 			master := repo.Status.GetMasterVersion()
@@ -117,12 +126,4 @@ func makePrepareRelease() {
 		}
 	}
 	findNext()
-	if setAllBranchesToMaster() {
-		// if it succeeds, disable this button
-		me.setBranchesToMasterB.Disable()
-		me.release.box.Enable()
-		PrintReleaseReport("", "")
-	} else {
-		log.Info("setAllBranchesToMaster() failed")
-	}
 }