code cleanup
This commit is contained in:
parent
250a96c49f
commit
fcd132c109
2
Makefile
2
Makefile
|
@ -1,6 +1,8 @@
|
||||||
VERSION = $(shell git describe --tags)
|
VERSION = $(shell git describe --tags)
|
||||||
|
|
||||||
all:
|
all:
|
||||||
|
@echo to test: 'make test'
|
||||||
|
@echo
|
||||||
@echo run this from the autotypist dir:
|
@echo run this from the autotypist dir:
|
||||||
@echo " GUIRELEASE_REASON=notsure guireleaser"
|
@echo " GUIRELEASE_REASON=notsure guireleaser"
|
||||||
@echo then:
|
@echo then:
|
||||||
|
|
|
@ -1,12 +1,7 @@
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"os"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"go.wit.com/gui"
|
"go.wit.com/gui"
|
||||||
"go.wit.com/lib/debugger"
|
|
||||||
"go.wit.com/lib/gui/logsettings"
|
|
||||||
"go.wit.com/log"
|
"go.wit.com/log"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -27,6 +22,7 @@ func globalDisplayOptions(box *gui.Node) {
|
||||||
})
|
})
|
||||||
hidegrid.NextRow()
|
hidegrid.NextRow()
|
||||||
|
|
||||||
|
/*
|
||||||
me.autoHideReadOnly = hidegrid.NewCheckbox("Hide read-only repos").SetChecked(true)
|
me.autoHideReadOnly = hidegrid.NewCheckbox("Hide read-only repos").SetChecked(true)
|
||||||
me.autoHideReadOnly.Custom = func() {
|
me.autoHideReadOnly.Custom = func() {
|
||||||
if me.autoHideReadOnly.Checked() {
|
if me.autoHideReadOnly.Checked() {
|
||||||
|
@ -54,7 +50,9 @@ func globalDisplayOptions(box *gui.Node) {
|
||||||
log.Info("env REPO_AUTO_SCAN=", os.Getenv("REPO_AUTO_SCAN"))
|
log.Info("env REPO_AUTO_SCAN=", os.Getenv("REPO_AUTO_SCAN"))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
hidegrid.NewButton("scan now", func() {
|
hidegrid.NewButton("scan now", func() {
|
||||||
log.Info("re-scanning repos now")
|
log.Info("re-scanning repos now")
|
||||||
i, s := me.repos.View.ScanRepositories()
|
i, s := me.repos.View.ScanRepositories()
|
||||||
|
@ -64,7 +62,7 @@ func globalDisplayOptions(box *gui.Node) {
|
||||||
me.duration = me.repos.View.MirrorScanDuration()
|
me.duration = me.repos.View.MirrorScanDuration()
|
||||||
hidegrid.Append(me.duration)
|
hidegrid.Append(me.duration)
|
||||||
|
|
||||||
hidegrid.NextRow()
|
*/
|
||||||
|
|
||||||
group1 = vbox.NewGroup("prep for release")
|
group1 = vbox.NewGroup("prep for release")
|
||||||
grid := group1.RawGrid()
|
grid := group1.RawGrid()
|
||||||
|
@ -101,6 +99,23 @@ func globalDisplayOptions(box *gui.Node) {
|
||||||
})
|
})
|
||||||
grid.NextRow()
|
grid.NextRow()
|
||||||
|
|
||||||
|
grid.NewButton("make prepare-release", func() {
|
||||||
|
loop := me.repos.View.ReposSortByName()
|
||||||
|
for loop.Scan() {
|
||||||
|
repo := loop.Repo()
|
||||||
|
|
||||||
|
master := repo.Status.GetMasterVersion()
|
||||||
|
lastTag := repo.Status.LastTag()
|
||||||
|
if master == lastTag {
|
||||||
|
repo.Status.SetTargetVersion(master)
|
||||||
|
} else {
|
||||||
|
repo.Status.IncrementRevisionVersion("Nov 2024 test")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
grid.NextRow()
|
||||||
|
|
||||||
|
/*
|
||||||
var incrementTags *gui.Node
|
var incrementTags *gui.Node
|
||||||
incrementTags = grid.NewButton("increment tags", func() {
|
incrementTags = grid.NewButton("increment tags", func() {
|
||||||
me.Disable()
|
me.Disable()
|
||||||
|
@ -206,8 +221,10 @@ func globalDisplayOptions(box *gui.Node) {
|
||||||
me.repos.View.ScanRepositories()
|
me.repos.View.ScanRepositories()
|
||||||
me.Enable()
|
me.Enable()
|
||||||
})
|
})
|
||||||
|
*/
|
||||||
grid.NextRow()
|
grid.NextRow()
|
||||||
|
|
||||||
|
/*
|
||||||
group2 := vbox.NewGroup("Debugger")
|
group2 := vbox.NewGroup("Debugger")
|
||||||
dbggrid := group2.NewGrid("gdb", 0, 0)
|
dbggrid := group2.NewGrid("gdb", 0, 0)
|
||||||
dbggrid.NewButton("logging Window", func() {
|
dbggrid.NewButton("logging Window", func() {
|
||||||
|
@ -218,8 +235,10 @@ func globalDisplayOptions(box *gui.Node) {
|
||||||
dbggrid.NewButton("Debugger Window", func() {
|
dbggrid.NewButton("Debugger Window", func() {
|
||||||
debugger.DebugWindow()
|
debugger.DebugWindow()
|
||||||
})
|
})
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
func hidePerfect() {
|
func hidePerfect() {
|
||||||
for _, repo := range me.repos.View.AllRepos() {
|
for _, repo := range me.repos.View.AllRepos() {
|
||||||
if repo.State() == "PERFECT" {
|
if repo.State() == "PERFECT" {
|
||||||
|
@ -231,3 +250,4 @@ func hidePerfect() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
|
@ -4,15 +4,16 @@ import (
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
"go.wit.com/lib/gui/repolist"
|
"go.wit.com/lib/gui/repolist"
|
||||||
"go.wit.com/log"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// like tcl/tk, use ENV variables to set display preferences
|
// like tcl/tk, use ENV variables to set display preferences
|
||||||
func hideFunction(r *repolist.RepoRow) {
|
func hideFunction(r *repolist.RepoRow) {
|
||||||
|
/*
|
||||||
if r.GoPath() == "go.wit.com/dev/alexflint/arg" {
|
if r.GoPath() == "go.wit.com/dev/alexflint/arg" {
|
||||||
log.Info("found autoHideReleased() =", me.autoHideReleased.Checked())
|
log.Info("found autoHideReleased() =", me.autoHideReleased.Checked())
|
||||||
log.Info("found alexflint/arg IsReleased() =", r.Status.IsReleased())
|
log.Info("found alexflint/arg IsReleased() =", r.Status.IsReleased())
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
// always show dirty repos
|
// always show dirty repos
|
||||||
if r.Status.IsDirty() {
|
if r.Status.IsDirty() {
|
||||||
|
@ -47,12 +48,14 @@ func hideFunction(r *repolist.RepoRow) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
if me.autoHideReleased.Checked() {
|
if me.autoHideReleased.Checked() {
|
||||||
if r.Status.IsReleased() {
|
if r.Status.IsReleased() {
|
||||||
r.Hide()
|
r.Hide()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
// show everything else. often this will be "unconforming" repos
|
// show everything else. often this will be "unconforming" repos
|
||||||
// if you what those repos ignored, add these to the config file
|
// if you what those repos ignored, add these to the config file
|
||||||
|
|
|
@ -170,6 +170,16 @@ func createReleaseBox(box *gui.Node) {
|
||||||
group = me.release.box.NewGroup("experimental and potentially dangerous stuff")
|
group = me.release.box.NewGroup("experimental and potentially dangerous stuff")
|
||||||
grid = group.NewGrid("buildOptions", 0, 0)
|
grid = group.NewGrid("buildOptions", 0, 0)
|
||||||
|
|
||||||
|
me.setBranchesToMasterB = grid.NewButton("set all branches to master", func() {
|
||||||
|
me.Disable()
|
||||||
|
defer me.Enable()
|
||||||
|
if setAllBranchesToMaster() {
|
||||||
|
// if it succeeds, disable this button
|
||||||
|
me.setBranchesToMasterB.Disable()
|
||||||
|
}
|
||||||
|
})
|
||||||
|
grid.NextRow()
|
||||||
|
|
||||||
grid.NewButton("git ls-files |grep go.mod", func() {
|
grid.NewButton("git ls-files |grep go.mod", func() {
|
||||||
for _, repo := range me.repos.View.AllRepos() {
|
for _, repo := range me.repos.View.AllRepos() {
|
||||||
log.Info("repo:", repo.Name())
|
log.Info("repo:", repo.Name())
|
||||||
|
|
|
@ -27,9 +27,9 @@ type autoType struct {
|
||||||
repos *repoWindow
|
repos *repoWindow
|
||||||
|
|
||||||
// #### guireleaser repolist display options
|
// #### guireleaser repolist display options
|
||||||
autoHideReadOnly *gui.Node
|
// autoHideReadOnly *gui.Node
|
||||||
autoHideReleased *gui.Node
|
// autoHideReleased *gui.Node
|
||||||
ignoreWhitelist *gui.Node
|
// ignoreWhitelist *gui.Node
|
||||||
|
|
||||||
// #### autotypist Global Build Options
|
// #### autotypist Global Build Options
|
||||||
// what to change all the branches to
|
// what to change all the branches to
|
||||||
|
|
|
@ -11,7 +11,8 @@ func initWhitelist() {
|
||||||
me.release.whitelist = make(map[string]*repolist.RepoRow)
|
me.release.whitelist = make(map[string]*repolist.RepoRow)
|
||||||
for _, repo := range me.repos.View.AllRepos() {
|
for _, repo := range me.repos.View.AllRepos() {
|
||||||
if strings.HasPrefix(repo.GoPath(), "go.wit.com/dev/davecgh") {
|
if strings.HasPrefix(repo.GoPath(), "go.wit.com/dev/davecgh") {
|
||||||
me.release.whitelist[repo.GoPath()] = repo
|
repo.Status.Whitelist = true
|
||||||
|
// me.release.whitelist[repo.GoPath()] = repo
|
||||||
}
|
}
|
||||||
//
|
//
|
||||||
// if repo.String() == "go.wit.com/apps/guireleaser" {
|
// if repo.String() == "go.wit.com/apps/guireleaser" {
|
||||||
|
@ -27,9 +28,9 @@ func initWhitelist() {
|
||||||
|
|
||||||
func whitelist(path string) bool {
|
func whitelist(path string) bool {
|
||||||
// log.Info("whitelist START", path)
|
// log.Info("whitelist START", path)
|
||||||
if me.ignoreWhitelist.Checked() {
|
// if me.ignoreWhitelist.Checked() {
|
||||||
return false
|
// return false
|
||||||
}
|
// }
|
||||||
|
|
||||||
_, ok := me.release.whitelist[path]
|
_, ok := me.release.whitelist[path]
|
||||||
if ok {
|
if ok {
|
||||||
|
|
Loading…
Reference in New Issue