diff options
| -rw-r--r-- | doRelease.go | 2 | ||||
| -rw-r--r-- | globalDisplayOptions.go | 4 | ||||
| -rw-r--r-- | lookForUnwind.go | 2 | ||||
| -rw-r--r-- | releaseBox.go | 6 | ||||
| -rw-r--r-- | structs.go | 2 | ||||
| -rw-r--r-- | whitelist.go | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/doRelease.go b/doRelease.go index 9ebd377..a78602e 100644 --- a/doRelease.go +++ b/doRelease.go @@ -97,7 +97,7 @@ func doRelease() bool { return true } -func checkValidGoSum(repo *repolist.Repo) bool { +func checkValidGoSum(repo *repolist.RepoRow) bool { ok, err := me.repos.View.CheckValidGoSum(repo) if err != nil { log.Info("go mod tidy not ok") diff --git a/globalDisplayOptions.go b/globalDisplayOptions.go index cec2202..6cac48f 100644 --- a/globalDisplayOptions.go +++ b/globalDisplayOptions.go @@ -8,7 +8,7 @@ import ( "go.wit.com/log" ) -func showHideRepos(repo *repolist.Repo) { +func showHideRepos(repo *repolist.RepoRow) { if repo.GoPath() == "go.wit.com/dev/alexflint/arg" { log.Info("found autoHideReleased() =", me.autoHideReleased.Checked()) log.Info("found alexflint/arg IsReleased() =", repo.Status.IsReleased()) @@ -150,7 +150,7 @@ func globalDisplayOptions(box *gui.Node) { log.Info(repo.GoPath(), "master and target differ", masterv, targetv) repo.Status.IncrementVersion() newversion := repo.Status.GetNewVersionTag() - repo.Status.SetTargetVersion(newversion) + repo.Status.SetTargetVersion("v" + newversion) // already incremented continue } diff --git a/lookForUnwind.go b/lookForUnwind.go index 239ab65..e195633 100644 --- a/lookForUnwind.go +++ b/lookForUnwind.go @@ -8,7 +8,7 @@ import ( "go.wit.com/log" ) -func lookToUnwind(r *repolist.Repo) bool { +func lookToUnwind(r *repolist.RepoRow) bool { goSumS := r.GoState() dirtyS := r.State() currentS := r.Status.GetCurrentBranchVersion() diff --git a/releaseBox.go b/releaseBox.go index b3955e8..7c1778c 100644 --- a/releaseBox.go +++ b/releaseBox.go @@ -40,11 +40,11 @@ type releaseStruct struct { makeRedomodB *gui.Node sendVersionB *gui.Node checkSafeB *gui.Node - whitelist map[string]*repolist.Repo + whitelist map[string]*repolist.RepoRow // store myself here. use myself to // do garbage go get tests and other potential junk - guireleaser *repolist.Repo + guireleaser *repolist.RepoRow } func (w *autoType) Disable() { @@ -266,7 +266,7 @@ func buttonEnable() { me.Enable() } -func setCurrentRepo(newcur *repolist.Repo, s string, note string) bool { +func setCurrentRepo(newcur *repolist.RepoRow, s string, note string) bool { if newcur.ReadOnly() { return false } @@ -17,7 +17,7 @@ type autoType struct { reposbox *gui.Node reposgrid *gui.Node reposgroup *gui.Node - current *repolist.Repo + current *repolist.RepoRow // guireleaser window mainWindow *gui.Node diff --git a/whitelist.go b/whitelist.go index 0b98f98..502e007 100644 --- a/whitelist.go +++ b/whitelist.go @@ -8,7 +8,7 @@ import ( ) func initWhitelist() { - me.release.whitelist = make(map[string]*repolist.Repo) + me.release.whitelist = make(map[string]*repolist.RepoRow) for _, repo := range me.repos.View.AllRepos() { if strings.HasPrefix(repo.GoPath(), "go.wit.com/dev/davecgh") { me.release.whitelist[repo.GoPath()] = repo |