summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Carr <[email protected]>2024-01-31 06:05:11 -0600
committerJeff Carr <[email protected]>2024-01-31 06:05:11 -0600
commit4d38d78b0d7101b88c810f57899eed130a1b6f9c (patch)
treeaf604d2cd7d7f0e998b684b21e77bbff945b56a4
parent3e9a55b2acedb3bb872bcf3d21f142cffeb2ca6d (diff)
this maybe will redo the tag correctly
Signed-off-by: Jeff Carr <[email protected]>
-rw-r--r--lookForUnwind.go40
-rw-r--r--unreleaseWindow.go31
2 files changed, 69 insertions, 2 deletions
diff --git a/lookForUnwind.go b/lookForUnwind.go
new file mode 100644
index 0000000..b3be1ad
--- /dev/null
+++ b/lookForUnwind.go
@@ -0,0 +1,40 @@
+// This is a simple example
+package main
+
+import (
+ "go.wit.com/log"
+)
+
+func (r *repo) lookToUnwind() bool {
+ goSumS := r.getGoSumStatus()
+ dirtyS := r.dirtyLabel.String()
+ currentS := r.status.GetCurrentBranchVersion()
+ log.Info("repo:", r.String(), goSumS, dirtyS, r.lastTag.String(), currentS)
+
+
+ curName := r.status.GetCurrentBranchName()
+ mName := r.status.GetMasterBranchName()
+
+ if curName == mName {
+ log.Info("\trepo is ready working from main branch", curName, "=", mName)
+ } else {
+ log.Info("\trepo is not ready main branch", curName, "!=", mName)
+ r.setGoSumStatus("CAN NOT UNWIND")
+ return false
+ }
+
+ if r.lastTag.String() != currentS {
+ log.Info("\trepo version mismatch last vs current", r.lastTag.String(), "!=", currentS)
+ r.setGoSumStatus("CAN NOT UNWIND")
+ return false
+ }
+
+ if "v" + release.versionS != r.lastTag.String() {
+ log.Info("\trepo version mismatch last vs official", r.lastTag.String(), "!=", release.versionS)
+ r.setGoSumStatus("CAN NOT UNWIND")
+ return false
+ }
+
+ r.setGoSumStatus("UNWIND")
+ return true
+}
diff --git a/unreleaseWindow.go b/unreleaseWindow.go
index 8cf20dc..e3a3625 100644
--- a/unreleaseWindow.go
+++ b/unreleaseWindow.go
@@ -9,9 +9,22 @@ import (
func createUnreleaseBox(box *gui.Node) {
group := release.box.NewGroup("undo and redo things")
- group.NewButton("punk the zip", func() {
+ group.NewButton("find the unreleased", func() {
me.Disable()
defer me.Enable()
+ for _, repo := range me.allrepos {
+ if whitelist(repo.String()) {
+ log.Info("skipping whitelist", repo.String())
+ continue
+ }
+
+ if repo.lookToUnwind() {
+ log.Info("found something to unwind:", repo.String())
+ if setCurrentRepo(repo, "rewind this", "very sure") {
+ }
+ return
+ }
+ }
})
group.NewButton("re-release"+release.versionS, func() {
me.Disable()
@@ -32,7 +45,21 @@ func createUnreleaseBox(box *gui.Node) {
log.Info("\treset to devel", curName, release.versionS, release.reasonS)
release.current.status.RunCmd([]string{"git", "checkout", "devel"})
- release.current.status.RunCmd([]string{"git", "branch", "-d", mName})
+ release.current.status.RunCmd([]string{"git", "branch", "-D", mName})
+ release.current.status.RunCmd([]string{"git", "branch", mName})
+ release.current.status.RunCmd([]string{"git", "checkout", mName})
+ release.current.status.RunCmd([]string{"git", "push", "--set-upstream", "--force", "origin", mName})
+
+ release.current.status.RunCmd([]string{"git", "tag", "--delete", "v" + release.versionS})
+ release.current.status.RunCmd([]string{"git", "push", "--delete", "origin", "v" + release.versionS})
+ release.current.status.RunCmd([]string{"git", "tag", "-m", release.reasonS, "v" + release.versionS})
+ release.current.status.RunCmd([]string{"git", "push", "origin", "v" + release.versionS})
+ // git tag --delete v0.3
+ // git push --delete origin v0.3
+
+ // git push --set-upstream --force origin guimaster
+
+ // release.current.status.RunCmd([]string{"git", "branch", "--unset-upstream", mName})
/*
release.current.status.RunCmd([]string{"git", "add", "-f", "go.sum"})
release.current.status.RunCmd([]string{"git", "commit", "-m", release.reasonS})