summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Carr <[email protected]>2025-01-29 16:41:01 -0600
committerJeff Carr <[email protected]>2025-01-29 16:41:01 -0600
commit1d6c67b46cc4d3ee137e3f4ddc6145841732cd7c (patch)
treefe82242799f80c02aee692ab64c34a9c34ce688b
parent2d118d3ae7399c435f8327c8fcee8240824d8edd (diff)
fix more of the logic errors
-rw-r--r--findNext.go31
-rw-r--r--main.go11
2 files changed, 19 insertions, 23 deletions
diff --git a/findNext.go b/findNext.go
index bc2ac7b..16c213f 100644
--- a/findNext.go
+++ b/findNext.go
@@ -113,33 +113,36 @@ func findNext() bool {
all := me.found.SortByFullPath()
for all.Scan() {
check := all.Next()
- if err := checkDeps(check); err != nil {
- log.Info("\t", check.GetGoPath(), err)
+ if check.GetMasterBranchName() != check.GetCurrentBranchName() {
+ log.Info("YOU MUST BE ON THE MASTER BRANCH", check.GetGoPath())
continue
- } else {
- log.Info("Might be ok?", check.GetGoPath())
}
- if check.GetMasterBranchName() != check.GetCurrentBranchName() {
- log.Info("YOU MUST BE ON THE MASTER BRANCHES")
- os.Exit(-1)
+ if check.IsDirty() {
+ log.Info("CAN NOT RELEASE DIRTY REPO", check.GetGoPath())
+ continue
}
+ log.Info("CHECKING:", check.GetGoPath())
_, err := check.RunVerboseOnError([]string{"go-mod-clean", "--strict"})
if err != nil {
- os.Exit(-1)
+ log.Info("FAILED:", check.GetGoPath())
+ continue
}
-
- if check.IsDirty() {
- log.Info("findNext() skipping dirty")
+ if err := checkDeps(check); err != nil {
+ log.Info("\t", check.GetGoPath(), err)
continue
+ } else {
+ log.Info("Might be ok?", check.GetGoPath())
}
+
findCounter += 1
if !check.ParseGoSum() {
- log.Info("ParseGoSum() failed")
- log.Info("ParseGoSum() failed")
- log.Info("ParseGoSum() failed")
+ log.Info("ParseGoSum() failed", check.GetGoPath())
+ log.Info("ParseGoSum() failed", check.GetGoPath())
+ log.Info("ParseGoSum() failed", check.GetGoPath())
continue
}
if me.forge.FinalGoDepsCheckOk(check, false) {
+ log.Info("GOOD TO GO ON", check.GetGoPath())
setCurrentRepo(check, "should be good to release", "pretty sure")
return true
} else {
diff --git a/main.go b/main.go
index 56adbfe..4720a0c 100644
--- a/main.go
+++ b/main.go
@@ -93,14 +93,6 @@ func main() {
// create the right side of the main window
createReleaseBox(me.mainBox)
- // disable the open repo button. this isn't really important
- // but does indicates the app (and toolkit) is working
- // this can be removed later, but in these early days, I'm using this
- // tool to release the code for this app, the gui and the gui toolkits
- // and sometimes they lie, don't display stuff, don't even disable things
- // so I can't trust even what I see. It's complicated right now still.
- me.release.openrepo.Disable()
-
// disable the gui until the repos are scanned
me.release.box.Disable()
me.Disable()
@@ -117,7 +109,6 @@ func main() {
msg := fmt.Sprint("Can not run if pwd is not a repo", pwd)
badExit(errors.New(msg))
}
- me.Enable()
// run this each time something gets published successfully
rePrepareRelease()
@@ -131,6 +122,8 @@ func main() {
os.Exit(0)
}
}
+ me.Enable()
+ me.release.box.Enable()
// intermittently scans the status indefinitly
me.repos.View.Watchdog(func() {