From e0335f1f3d682531e20c87d488d51e7d522de9e3 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Wed, 22 Oct 2025 12:19:43 -0500 Subject: more attempts to fix this --- Makefile | 7 +++++++ http.go | 4 ++-- main.go | 12 ++++++++++-- prepareRelease.go | 4 ++-- 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 86c3145..d35b72b 100644 --- a/Makefile +++ b/Makefile @@ -131,3 +131,10 @@ test-build-new: cd ~/go/src/go.wit.com/lib/xgb/ && rm -f go.* cd ~/go/src/go.wit.com/lib/xgb/ && git checkout go.mod cd ~/go/src/go.wit.com/lib/xgb/ && time guireleaser --gui andlabs + +# time GUIRELEASE_REASON="safe-build" make test-build-new +test-build-new-skip-master-branch-check: + -rm ~/go/bin/forged + cd ~/go/src/go.wit.com/lib/xgb/ && rm -f go.* + cd ~/go/src/go.wit.com/lib/xgb/ && git checkout go.mod + cd ~/go/src/go.wit.com/lib/xgb/ && time guireleaser --gui andlabs --force diff --git a/http.go b/http.go index db54d57..625e043 100644 --- a/http.go +++ b/http.go @@ -23,9 +23,9 @@ func okHandler(w http.ResponseWriter, r *http.Request) { switch route { case "/releaseList": - footer := me.found.PrintDefaultTB() + footer := me.found.PrintPublishTable() log.Info("me.found len:", me.found.Len()) - log.Info("PrintTable() footer:", footer) + log.Info("PrintPublishTable() footer:", footer) return default: log.Info("BAD URL = " + route) diff --git a/main.go b/main.go index 5427803..5a7c184 100644 --- a/main.go +++ b/main.go @@ -28,9 +28,15 @@ func main() { me.forge, _ = forgepb.Init() me.found = new(gitpb.Repos) + for repo := range me.forge.Repos.IterAll() { + if repo.TargetVersion != "" { + log.Info("erasing target version", repo.TargetVersion, repo.FullPath) + } + } + me.forge.Save() + fhelp.CheckGoModCleanExit() - // me.forge.ConfigPrintTable() os.Setenv("REPO_WORK_PATH", ENV.Get("gopath")) // save the ENV var here @@ -93,7 +99,9 @@ func main() { } if _, count, _, err := me.forge.IsEverythingOnMaster(); err != nil { - log.Info("not everything is on the master branch (", count, "repos)") + log.Info("") + log.Info("not everything is on the master branch (", count, "repos) (--force to skip)") + log.Info("") if argv.Quick != nil { // quick also means ignore the master branch check argv.Force = true diff --git a/prepareRelease.go b/prepareRelease.go index aacdb19..8ae8be1 100644 --- a/prepareRelease.go +++ b/prepareRelease.go @@ -225,9 +225,9 @@ func rePrepareRelease() { } } - footer := me.found.PrintDefaultTB() + footer := me.found.PrintPublishTable() log.Info("me.found len:", me.found.Len()) - log.Info("PrintTable() footer:", footer) + log.Info("PrintPublishTable() footer:", footer) // todo: verify each found repo is on the master branch for repo := range me.found.IterAll() { if repo.CurrentBranchName != repo.MasterBranchName { -- cgit v1.2.3