diff options
| -rw-r--r-- | main.go | 2 | ||||
| -rw-r--r-- | releaseWindow.go | 12 | ||||
| -rw-r--r-- | structs.go | 2 | ||||
| -rw-r--r-- | unreleaseWindow.go | 4 |
4 files changed, 11 insertions, 9 deletions
@@ -30,6 +30,8 @@ func main() { repoworld() + me.releaseReasonS = "better Malinae" + for _, repo := range me.allrepos { repo.status.UpdateCurrent() repo.newScan() diff --git a/releaseWindow.go b/releaseWindow.go index 2372fc4..f18aa51 100644 --- a/releaseWindow.go +++ b/releaseWindow.go @@ -30,7 +30,7 @@ type releaseStruct struct { releaseVersionB *gui.Node unreleaseB *gui.Node reason *gadgets.BasicEntry - reasonS string + // reasonS string openrepo *gui.Node @@ -60,8 +60,6 @@ func (w *autoType) Enable() { } func createReleaseBox(box *gui.Node) { - release.reasonS = "gocui dropdown select" - initWhitelist() release.box = box @@ -136,7 +134,7 @@ func createReleaseBox(box *gui.Node) { return } - log.Info("\ttag and push", curName, release.version.String(), release.reasonS) + log.Info("\ttag and push", curName, release.version.String(), me.releaseReasonS) var all [][]string all = append(all, []string{"git", "add", "-f", "go.mod"}) @@ -145,9 +143,9 @@ func createReleaseBox(box *gui.Node) { } else { all = append(all, []string{"git", "add", "-f", "go.sum"}) } - all = append(all, []string{"git", "commit", "-m", release.reasonS}) + all = append(all, []string{"git", "commit", "-m", me.releaseReasonS}) all = append(all, []string{"git", "push"}) - all = append(all, []string{"git", "tag", "-m", release.reasonS, release.version.String()}) + all = append(all, []string{"git", "tag", "-m", me.releaseReasonS, release.version.String()}) all = append(all, []string{"git", "push", "origin", release.version.String()}) if doAll(release.current, all) { @@ -242,7 +240,7 @@ func createReleaseBox(box *gui.Node) { release.version = gadgets.NewOneLiner(release.grid, "version") release.reason = gadgets.NewBasicEntry(release.grid, "release reason") - release.reason.SetText(release.reasonS) + release.reason.SetText(me.releaseReasonS) me.autoWorkingPwd = gadgets.NewOneLiner(release.grid, "working directory (pwd)") me.userHomePwd = gadgets.NewOneLiner(release.grid, "user home") @@ -19,6 +19,8 @@ type autoType struct { allrepos map[string]*repo myGui *gui.Node + releaseReasonS string // = "gocui dropdown select" + // autotypistWindow *gadgets.BasicWindow mainWindow *gui.Node mainBox *gui.Node diff --git a/unreleaseWindow.go b/unreleaseWindow.go index 244e568..fba1b85 100644 --- a/unreleaseWindow.go +++ b/unreleaseWindow.go @@ -115,7 +115,7 @@ func rerelease() bool { return false } - log.Info("\treset to devel", curName, release.version.String(), release.reasonS) + log.Info("\treset to devel", curName, release.version.String(), me.releaseReasonS) var all [][]string all = append(all, []string{"git", "checkout", "devel"}) @@ -126,7 +126,7 @@ func rerelease() bool { all = append(all, []string{"git", "tag", "--delete", release.version.String()}) all = append(all, []string{"git", "push", "--delete", "origin", release.version.String()}) - all = append(all, []string{"git", "tag", "-m", release.reasonS, release.version.String()}) + all = append(all, []string{"git", "tag", "-m", me.releaseReasonS, release.version.String()}) all = append(all, []string{"git", "push", "origin", release.version.String()}) if doAll(release.current, all) { |