1 files changed, 40 insertions, 32 deletions

diff --git a/prepareRelease.go b/prepareRelease.go
index 2f86dae..821e510 100644
--- a/prepareRelease.go
+++ b/prepareRelease.go
@@ -2,7 +2,6 @@ package main
 
 import (
 	"os"
-	"strings"
 	"time"
 
 	"go.wit.com/lib/gui/shell"
@@ -16,6 +15,11 @@ func makePrepareRelease() {
 	me.release.box.Disable()
 	defer me.Enable()
 
+	now := time.Now()
+	me.forge.RillFuncError(rillRestore)
+	// slowRestore()
+	log.Printf("showRestore() (%d total repos) took:%s\n", me.forge.Repos.Len(), shell.FormatDuration(time.Since(now)))
+
 	// run this each time something gets published successfully
 	rePrepareRelease()
 
@@ -39,28 +43,32 @@ func forceReleaseVersion(repo *gitpb.Repo) {
 			os.Exit(-1)
 		}
 	}
-	// empty git notes
-	if result, err := repo.RunStrictNew([]string{"go-mod-clean", "--purge"}); err != nil {
-		log.Info("probably you don't have gomodclean")
-		log.Info(strings.Join(result.Stdout, "\n"))
-		log.Info(strings.Join(result.Stderr, "\n"))
-		repo.Run([]string{"git", "notes", "remove"})
-		os.Exit(-1)
-	}
+	/*
+		// empty git notes
+		if _, err := repo.RunVerboseOnError([]string{"go-mod-clean", "--purge"}); err != nil {
+			// log.Info("probably you don't have gomodclean")
+			// log.Info(strings.Join(result.Stdout, "\n"))
+			// log.Info(strings.Join(result.Stderr, "\n"))
+			// repo.Run([]string{"git", "notes", "remove"})
+			os.Exit(-1)
+		}
 
-	if !runGoClean(repo, "--restore") {
-		log.Info("gomodclean probably failed here. that's ok", repo.GetGoPath())
-		// os.Exit(-1)
-	}
+		if !runGoClean(repo, "--restore") {
+			log.Info("gomodclean probably failed here. that's ok", repo.GetGoPath())
+			// os.Exit(-1)
+		}
+	*/
 }
 func rillGoModRestore(repo *gitpb.Repo) error {
-	if repo.GetTargetVersion() == "" {
-		// not set to upgrade
-		return nil
-	}
-	if repo.GetLastTag() == repo.GetTargetVersion() {
-		return nil
-	}
+	/*
+		if repo.GetTargetVersion() == "" {
+			// not set to upgrade
+			return nil
+		}
+		if repo.GetLastTag() == repo.GetTargetVersion() {
+			return nil
+		}
+	*/
 	if me.forge.Config.IsReadOnly(repo.GetGoPath()) {
 		return nil
 	}
@@ -76,9 +84,9 @@ func rePrepareRelease() {
 	me.forge = forgepb.Init()
 	me.found = new(gitpb.Repos)
 
-	now := time.Now()
-	me.forge.RillFuncError(rillGoModRestore)
-	log.Printf("rillFixGodeps() (%d total repos) took:%s\n", me.forge.Repos.Len(), shell.FormatDuration(time.Since(now)))
+	//	now := time.Now()
+	//	me.forge.RillFuncError(rillGoModRestore)
+	//	log.Printf("rillFixGodeps() (%d total repos) took:%s\n", me.forge.Repos.Len(), shell.FormatDuration(time.Since(now)))
 
 	all := me.forge.Repos.SortByFullPath()
 	for all.Scan() {
@@ -124,16 +132,16 @@ func rePrepareRelease() {
 
 		// if the repo is a go binary or plugin for a new release for
 		// any library version change
-		if check.GetRepoType() == "binary" || check.GetRepoType() == "plugin" {
-			// check if the package dependancies changed, if so, re-publish
-			if me.forge.FinalGoDepsCheckOk(check, false) {
-				log.Printf("go.sum is perfect! %s\n", check.GetGoPath())
-				continue
-			}
-			log.Printf("dependancy checks indicate a new release is needed for %s\n", check.GetGoPath())
-			forceReleaseVersion(check)
-			me.found.AppendByGoPath(check)
+		//		if check.GetRepoType() == "binary" || check.GetRepoType() == "plugin" {
+		// check if the package dependancies changed, if so, re-publish
+		if me.forge.FinalGoDepsCheckOk(check, false) {
+			log.Printf("go.sum is perfect! %s\n", check.GetGoPath())
+			continue
 		}
+		log.Printf("dependancy checks indicate a new release is needed for %s\n", check.GetGoPath())
+		forceReleaseVersion(check)
+		me.found.AppendByGoPath(check)
+		//		}
 
 	}
 	me.forge.PrintHumanTable(me.found)