build-quick

Makefile

@@ -58,9 +58,6 @@ findNext:
 showNext:
 	curl --silent http://localhost:9419/showNext
 
-testNext:
-	curl --silent http://localhost:9419/testNext
-
 doRelease:
 	reset
 	make showNext
@@ -96,8 +93,33 @@ 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
+
+test-build-force:
+	GUIRELEASE_REASON="safe-build" guireleaser --gui andlabs --force
+
+# time 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
+	cd ~/go/src/go.wit.com/apps/guireleaser
+	wit-test debian --verbose
+	do-aptly
+
+# time GUIRELEASE_REASON="safe-build" make test-build-quick
+test-build-quick:
+	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

doRelease.go

@@ -54,7 +54,7 @@ func doRelease() error {
 		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())
-		check.Reload()
+		check.ReloadCheck()
 		return fmt.Errorf("already released %s", check.GetGoPath())
 	}
 

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)
 }
 

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 {

main.go

@@ -32,7 +32,7 @@ func main() {
 	me.pp = arg.MustParse(&argv)
 
 	me.forge = forgepb.Init()
-	me.forge.ScanGoSrc()
+	me.forge.ScanRepoDir() // looks for new dirs, checks existing repos for changes
 	me.found = new(gitpb.Repos)
 
 	fhelp.CheckGoModCleanExit()

prepareRelease.go

@@ -90,8 +90,7 @@ func rillRestore(repo *gitpb.Repo) error {
 }
 
 func rePrepareRelease() {
-	// reload the config
+	me.forge.ScanRepoDir() // looks for new dirs, checks existing repos for changes
-	me.forge.ScanGoSrc()
 	me.found = new(gitpb.Repos)
 	me.reason = make(map[*gitpb.Repo]string) // stores the reason repos need to be versioned & released
 

releaseBox.go

@@ -9,7 +9,6 @@ import (
 	"go.wit.com/log"
 
 	"go.wit.com/lib/gadgets"
-	"go.wit.com/lib/gui/repolist"
 	"go.wit.com/lib/gui/shell"
 	"go.wit.com/lib/protobuf/gitpb"
 )
@@ -33,7 +32,7 @@ type releaseStruct struct {
 	checkDirtyB  *gui.Node
 	sendVersionB *gui.Node
 	checkSafeB   *gui.Node
-	whitelist    map[string]*repolist.RepoRow
+	// whitelist    map[string]*repolist.RepoRow
 }
 
 func (w *autoType) Disable() {
@@ -62,14 +61,6 @@ func createReleaseBox(box *gui.Node) {
 			log.Info("doRelease() FAILED", err, fpath)
 			log.Info("doRelease() FAILED", err, fpath)
 		}
-		/*
-			me.forge.PrintHumanTable(me.found)
-			me.forge.ScanGoSrc()
-			me.found = new(gitpb.Repos)
-			r := me.forge.Repos.FindByFullPath(fpath)
-			me.found.Append(r)
-			me.forge.PrintHumanTable(me.found)
-		*/
 		skipToNext()
 		me.forge.PrintHumanTable(me.found)
 	})
@@ -93,14 +84,6 @@ func createReleaseBox(box *gui.Node) {
 	me.release.grid.NextRow()
 
 	me.release.repo = gadgets.NewOneLiner(me.release.grid, "repo")
-	/*
-		me.release.openrepo = me.release.grid.NewButton("Configure", func() {
-			if repov := me.repos.View.FindByPath(me.current.GetGoPath()); repov != nil {
-				repov.Status.Toggle()
-			}
-		})
-		me.release.openrepo.Disable()
-	*/
 	me.release.grid.NextRow()
 	me.release.status = gadgets.NewOneLiner(me.release.grid, "status")
 	me.release.grid.NextRow()
@@ -127,11 +110,6 @@ func createReleaseBox(box *gui.Node) {
 	group := me.release.box.NewGroup("Run on Current Repo")
 	grid := group.NewGrid("buildOptions", 0, 0)
 
-	/*
-		grid.NewButton("whitelist", func() {
-		})
-	*/
-
 	grid.NextRow()
 
 	group = me.release.box.NewGroup("Publish until done")
@@ -166,12 +144,12 @@ func doReleaseAll() {
 
 func skipToNext() error {
 	shell.RunVerbose([]string{"forge", "dirty"})
-	log.Info("Sleeping for 3 seconds. Forge file should have been rewritten")
+	log.Info("Sleeping for 2 seconds for no reason.")
-	time.Sleep(3)
+	time.Sleep(1)
-	me.forge.ScanGoSrc()
+	me.forge.ScanRepoDir() // looks for new dirs, checks existing repos for changes
 	me.found = new(gitpb.Repos)
 
-	me.current.Reload()
+	me.current.ReloadCheck()
 	me.forge.SetConfigSave(true)
 	me.forge.ConfigSave()
 	log.Info("sleep 2")