patch stuffv0.23.102

2 files changed, 19 insertions, 11 deletions

diff --git a/Makefile b/Makefile
index 5f0dbcd..1f9c176 100644
--- a/Makefile
+++ b/Makefile
@@ -89,10 +89,15 @@ list-release-notdone:
 	curl --silent http://localhost:9419/releaseList?readonly=true
 
 safe-build: install
-	forge list --private
+	# forge list --private
 	wit-test install --verbose
 	# cd ~/go/src/go.wit.com/lib/xgb/ && time GUIRELEASE_REASON="safe-build" guireleaser --gui gocui --gui-verbose --gui-file ../../toolkits/gocui/gocui.so >/tmp/forge.log 2>&1
 	rm -f go.* ; git checkout go.mod ; cd ~/go/src/go.wit.com/lib/xgb/ && time GUIRELEASE_REASON="safe-build" guireleaser --gui andlabs
 
+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
+	sudo "wit update"
+
 autocomplete:
 	guireleaser --bash > ~/.local/share/bash-completion/completions/guireleaser
diff --git a/prepareRelease.go b/prepareRelease.go
index 602317f..f748485 100644
--- a/prepareRelease.go
+++ b/prepareRelease.go
@@ -135,6 +135,19 @@ func rePrepareRelease() {
 			continue
 		}
 
+		master := check.GetMasterVersion()
+		lastTag := check.GetLastTag()
+
+		if argv.Quick != nil {
+			// if argv has 'quick' don't do anything
+			// that doesn't actually have a patch
+			if master == lastTag {
+				continue
+			}
+		}
+		log.Info("LAST TAG", check.FullPath, master, lastTag)
+
+		// this is detailed. It makes sure the go.* files are absolutely perfect
 		if !me.forge.Config.IsPrivate(check.GetGoPath()) {
 			if err := checkPublishedGodeps(check); err != nil {
 				// this means the published godeps are no longer up to date
@@ -148,8 +161,6 @@ func rePrepareRelease() {
 		}
 
 		// if master != lastTag, always increment
-		master := check.GetMasterVersion()
-		lastTag := check.GetLastTag()
 		if master != lastTag {
 			newmhash := check.GetTagHash(master)
 			oldlhash := check.GetTagHash(lastTag)
@@ -186,14 +197,6 @@ func rePrepareRelease() {
 			continue
 		}
 
-		if argv.Quick != nil {
-			// if argv has 'quick' don't do anything
-			// that doesn't actually have a patch
-			if master == lastTag {
-				continue
-			}
-		}
-
 		if argv.Protobuf && check.GetRepoType() == "protobuf" {
 			log.Printf("NEED RELEASE FOR %s err: %v\n", check.GetGoPath(), "because --protobuf")
 			// if --protobuf, this will force upgrade each one