From f690c1a8a328d1b136af728538c418849391e572 Mon Sep 17 00:00:00 2001
From: Jeff Carr <jcarr@wit.com>
Date: Wed, 29 Jan 2025 21:24:08 -0600
Subject: [PATCH] need fixes to force versions in go.mod

---
 doRelease.go      |  3 ++-
 findNext.go       | 26 ++++++++++++++------------
 prepareRelease.go |  7 ++-----
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/doRelease.go b/doRelease.go
index 6fe4765..ee4c4b4 100644
--- a/doRelease.go
+++ b/doRelease.go
@@ -46,7 +46,8 @@ func doRelease() bool {
 		return false
 	}
 
-	check := me.forge.FindByGoPath(me.current.GetGoPath())
+	// check := me.forge.FindByGoPath(me.current.GetGoPath())
+	check := me.current
 	if check == nil {
 		log.Info("boo, you didn't git clone", me.current.GetGoPath())
 		return false
diff --git a/findNext.go b/findNext.go
index bd5c12b..d307343 100644
--- a/findNext.go
+++ b/findNext.go
@@ -66,9 +66,7 @@ func findNext() bool {
 			continue
 		}
 		if alreadyDone(check) {
-			log.Info("findNext() ALREADY DONE. WHY IS THIS STILL CHECKING?", check.GetGoPath())
-			log.Info("findNext() ALREADY DONE. WHY IS THIS STILL CHECKING?", check.GetGoPath())
-			log.Info("findNext() ALREADY DONE. WHY IS THIS STILL CHECKING?", check.GetGoPath())
+			log.Info("findNext() alreadyDone. WHY IS THIS STILL CHECKING?", check.GetGoPath())
 			continue
 		}
 		log.Info("CHECKING:", check.GetGoPath())
@@ -87,6 +85,12 @@ func findNext() bool {
 			continue
 		}
 
+		if err := me.forge.CleanGoDepsCheckOk(check); err != nil {
+			log.Info("CleanGoDepsCheckOk() failed", check.GetGoPath(), err)
+			log.Info("CleanGoDepsCheckOk() failed", check.GetGoPath(), err)
+			continue
+		}
+
 		if err := checkDeps(check); err != nil {
 			log.Info("\t", check.GetGoPath(), err)
 			continue
@@ -94,16 +98,14 @@ func findNext() bool {
 			log.Info("Might be ok?", check.GetGoPath())
 		}
 
-		if err := me.forge.FinalGoDepsCheckOk(check, argv.Verbose); err == nil {
-			log.Info("GOOD TO GO ON", check.GetGoPath())
-			setCurrentRepo(check, "should be good to release", "pretty sure")
-			return true
-		} else {
-			log.Info("FinalGoDepsCheckOk() failed")
-			log.Info("FinalGoDepsCheckOk() failed")
-			log.Info("FinalGoDepsCheckOk() failed")
+		if err := me.forge.FinalGoDepsCheckOk(check, argv.Verbose); err != nil {
+			log.Info("FinalGoDepsCheckOk() repo=", check.GetGoPath(), "err:", err)
+			log.Info("FinalGoDepsCheckOk() repo=", check.GetGoPath(), "err:", err)
+			continue
 		}
-		log.Info("findNext() got to the end. repo", check.GetGoPath(), "did not work. trying to find a new one now")
+		log.Info("GOOD TO GO ON", check.GetGoPath())
+		setCurrentRepo(check, "should be good to release", "pretty sure")
+		return true
 	}
 	if findCounter == 0 {
 		log.Info("NOTHING TO UPDATE. findCounter =", findCounter)
diff --git a/prepareRelease.go b/prepareRelease.go
index e56cda1..cab4321 100644
--- a/prepareRelease.go
+++ b/prepareRelease.go
@@ -7,7 +7,6 @@ import (
 	"time"
 
 	"go.wit.com/lib/gui/shell"
-	"go.wit.com/lib/protobuf/forgepb"
 	"go.wit.com/lib/protobuf/gitpb"
 	"go.wit.com/log"
 )
@@ -62,7 +61,7 @@ func rillRestore(repo *gitpb.Repo) error {
 
 func rePrepareRelease() {
 	// reload the config
-	me.forge = forgepb.Init()
+	// me.forge = forgepb.Init()
 	me.found = new(gitpb.Repos)
 
 	now := time.Now()
@@ -77,9 +76,7 @@ func rePrepareRelease() {
 			// means it was already published
 			// protects against logic errors that might result
 			// in an infinite loop
-			log.Info("WARNING already done", check.GetGoPath())
-			log.Info("WARNING already done", check.GetGoPath())
-			log.Info("WARNING already done", check.GetGoPath())
+			log.Info("WARNING alreadyDone rePrepareRelease()", check.GetGoPath())
 			continue
 		}