From 5ceab01b0e158d63582ae1610475bbe56233b4ee Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Sat, 13 Sep 2025 01:31:07 -0500 Subject: [PATCH] smarter build --- Makefile | 10 +++++++++- exit.go | 1 + findNext.go | 13 ------------- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 9d97e85..397d9f6 100644 --- a/Makefile +++ b/Makefile @@ -93,12 +93,20 @@ safe-build: install build-quick: install wit-test install --verbose - rm -f go.* ; git checkout go.mod ; cd ~/go/src/go.wit.com/lib/xgb/ && time GUIRELEASE_REASON="safe-build" guireleaser --gui andlabs quick + # rm -f go.* ; git checkout go.mod ;cd ~/go/src/go.wit.com/lib/xgb/ && time GUIRELEASE_REASON="safe-build" guireleaser --gui andlabs quick sudo "wit update" autocomplete: guireleaser --bash > ~/.local/share/bash-completion/completions/guireleaser +# GUIRELEASE_REASON="safe-build" make test-build test-build: -wit-test install --verbose 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 quick + cd ~/go/src/go.wit.com/apps/guireleaser + wit-test debian --verbose + do-aptly + sudo "wit update" diff --git a/exit.go b/exit.go index 1927726..733d1ec 100644 --- a/exit.go +++ b/exit.go @@ -9,6 +9,7 @@ import ( func okExit(thing string) { log.Info(thing, "ok") // log.Info("Finished go-clean on", check.GetNamespace(), "ok") + me.forge.Exit() os.Exit(0) } diff --git a/findNext.go b/findNext.go index 6c6b6b8..0886d1f 100644 --- a/findNext.go +++ b/findNext.go @@ -8,7 +8,6 @@ import ( "go.wit.com/log" - "go.wit.com/lib/gui/shell" "go.wit.com/lib/protobuf/gitpb" ) @@ -120,18 +119,6 @@ func findNext() bool { log.Info("NOTHING TO UPDATE. findCounter =", findCounter, "found len =", me.found.Len()) if me.found.Len() == 0 { printDone() - log.Info("cd lib/; make debian") - wit := me.forge.FindByGoPath("go.wit.com/apps/utils/wit-test") - if wit != nil { - log.Info("cd", wit.GetFullPath()) - os.Chdir(wit.GetFullPath()) - shell.Exec([]string{"ls", "-l"}) - if argv.Full { - shell.Exec([]string{"make", "debian-release-force"}) - } else { - shell.Exec([]string{"make", "debian-release"}) - } - } okExit("") } } else {