diff --git a/findNext.go b/findNext.go index 4436446..7b091b2 100644 --- a/findNext.go +++ b/findNext.go @@ -41,7 +41,7 @@ func findNext() bool { 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() + all := me.found.SortByFullPath() for all.Scan() { check := all.Next() @@ -63,24 +63,29 @@ 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() { + log.Info("ParseGoSum() failed") + log.Info("ParseGoSum() failed") + log.Info("ParseGoSum() failed") continue } if me.forge.FinalGoDepsCheckOk(check, false) { setCurrentRepo(check, "should be good to release", "pretty sure") return true + } else { + log.Info("FinalGoDepsCheckOk() failed") + log.Info("FinalGoDepsCheckOk() failed") + log.Info("FinalGoDepsCheckOk() failed") } log.Info("findNext() got to the end. repo", check.GetGoPath(), "did not work. trying to find a new one now") } @@ -131,8 +136,14 @@ func runGoClean(check *gitpb.Repo, myarg string) bool { // tries to fix the go.mod and go.sum files func fixGodeps(check *gitpb.Repo) bool { + log.Info("fixGoDeps() START", check.GetGoPath()) + log.Info("fixGoDeps() START", check.GetGoPath()) + log.Info("fixGoDeps() START", check.GetGoPath()) var good bool = true if !runGoClean(check, "--strict") { + log.Info("fixGoDeps() runGoClean() strict failed", check.GetGoPath()) + log.Info("fixGoDeps() runGoClean() strict failed", check.GetGoPath()) + log.Info("fixGoDeps() runGoClean() strict failed", check.GetGoPath()) return false } // skip primative ones @@ -144,7 +155,9 @@ func fixGodeps(check *gitpb.Repo) bool { log.Info("fixGoDeps() skipping primitive", check.GetGoPath()) return true } - log.Printf("current repo %s go dependancy count: %d", check.GetGoPath(), check.GoDepsLen()) + log.Printf("current repo %s go dependancy count: %d\n", check.GetGoPath(), check.GoDepsLen()) + log.Printf("current repo %s go dependancy count: %d\n", check.GetGoPath(), check.GoDepsLen()) + log.Printf("current repo %s go dependancy count: %d\n", check.GetGoPath(), check.GoDepsLen()) deps := check.GoDeps.SortByGoPath() for deps.Scan() { depRepo := deps.Next() @@ -160,11 +173,12 @@ func fixGodeps(check *gitpb.Repo) bool { log.Info("not found:", depRepo.GetGoPath()) continue } + log.Printf("%-48s dep ver=%10s repo ver=%10s target ver=%10s\n", found.GetGoPath(), depRepo.GetVersion(), found.GetMasterVersion(), found.GetTargetVersion()) if depRepo.GetVersion() != found.GetMasterVersion() { - log.Printf("%-48s %10s (gitpb depRepo)", depRepo.GetGoPath(), depRepo.GetVersion()) - log.Printf("%-48s %10s (gitpb found)", found.GetGoPath(), found.GetMasterVersion()) + log.Printf("%-48s %10s (gitpb depRepo)\n", depRepo.GetGoPath(), depRepo.GetVersion()) + log.Printf("%-48s %10s (gitpb found)\n", found.GetGoPath(), found.GetMasterVersion()) cmd := []string{"go", "get", depRepo.GetGoPath() + "@latest"} - check.Run(cmd) + check.RunVerbose(cmd) } } return good diff --git a/prepareRelease.go b/prepareRelease.go index a06c058..1c0fcb6 100644 --- a/prepareRelease.go +++ b/prepareRelease.go @@ -16,17 +16,6 @@ func makePrepareRelease() { me.release.box.Disable() defer me.Enable() - /* - if setAllBranchesToMaster() { - // if it succeeds, disable this button - me.setBranchesToMasterB.Disable() - me.release.box.Enable() - me.forge.PrintReleaseReport(me.found) - } else { - log.Info("setAllBranchesToMaster() failed") - } - */ - // run this each time something gets published successfully rePrepareRelease()