From 57883ffa614946333fbc20942ea332c959424bc3 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Sat, 18 Jan 2025 11:11:06 -0600 Subject: [PATCH] rill stuff --- doRelease.go | 3 ++- findNext.go | 34 ++++++++++++++++++++++++++-------- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/doRelease.go b/doRelease.go index a089ff9..bfcd390 100644 --- a/doRelease.go +++ b/doRelease.go @@ -58,7 +58,8 @@ func doRelease() bool { log.Info("doRelease() WARNING. should have never gotten here. return true. already done", check.GetGoPath()) log.Info("doRelease() WARNING. should have never gotten here. return true. already done", check.GetGoPath()) log.Info("doRelease() WARNING. should have never gotten here. return true. already done", check.GetGoPath()) - log.Sleep(5) + check.Reload() + log.Sleep(1) return true } me.done = append(me.done, me.current.GetGoPath()) diff --git a/findNext.go b/findNext.go index 4ff430c..34f09b3 100644 --- a/findNext.go +++ b/findNext.go @@ -2,8 +2,11 @@ package main import ( + "time" + "go.wit.com/log" + "go.wit.com/lib/gui/shell" "go.wit.com/lib/protobuf/gitpb" ) @@ -11,10 +14,23 @@ var findCounter int var findFix bool = false var findOk bool = true +func rillFixGodeps(repo *gitpb.Repo) error { + if fixGodeps(repo) { + log.Info("fixGoDeps() returned true") + } else { + log.Info("fixGoDeps() returned false") + } + return nil +} + // trys to figure out if there is still something to update // todo: redo this logic as it is terrible // rename this findNext() func findNext() bool { + now := time.Now() + me.forge.RillFuncError(2, 2, rillFixGodeps) + log.Printf("rillFixGodeps() (%d total repos) took:%s\n", me.forge.Repos.Len(), shell.FormatDuration(time.Since(now))) + findCounter = 0 all := me.forge.Repos.SortByFullPath() for all.Scan() { @@ -38,15 +54,17 @@ func findNext() bool { log.Info("findNext() skipping dirty") continue } - if findFix { - log.Info("findFix is true. running fixGoDeps()") - if fixGodeps(check) { - log.Info("fixGoDeps() returned true") - } else { - log.Info("fixGoDeps() returned false") - } + /* + if findFix { + log.Info("findFix is true. running fixGoDeps()") + if fixGodeps(check) { + log.Info("fixGoDeps() returned true") + } else { + log.Info("fixGoDeps() returned false") + } - } + } + */ findCounter += 1 if !check.ParseGoSum() { continue