From 8d7f182be7981f5d922b0b6ad3087b8b5490bb60 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Thu, 1 Feb 2024 14:30:30 -0600 Subject: [PATCH] more things. slow slog Signed-off-by: Jeff Carr --- checkReady.go | 10 +++++++--- releaseWindow.go | 12 +++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/checkReady.go b/checkReady.go index 2a5c2e3..0e7ff27 100644 --- a/checkReady.go +++ b/checkReady.go @@ -36,13 +36,17 @@ func CheckReady() bool { currentS := release.current.status.GetCurrentBranchVersion() var targetS string - targetS = "v" + release.version.String() + targetS = release.version.String() + log.Info("repo:", release.current.String(), goSumS, dirtyS, lastS, currentS, targetS) - if goSumS == "PRIMATIVE" { + if goSumS == "RELEASED" { return true } - if goSumS == "RELEASED" { + if goSumS == "PRIMATIVE" { + if targetS == lastS { + release.current.setGoSumStatus("RELEASED") + } return true } if goSumS == "UNCHANGED" { diff --git a/releaseWindow.go b/releaseWindow.go index 620f487..9c0cc16 100644 --- a/releaseWindow.go +++ b/releaseWindow.go @@ -72,6 +72,7 @@ func createReleaseBox(box *gui.Node) { release.grid.NewButton("scan for Ready", func() { me.Disable() scanForReady() + scanForReady() me.Enable() }) release.grid.NewButton("findNextDirty()", func() { @@ -100,6 +101,10 @@ func createReleaseBox(box *gui.Node) { log.Warn("can do PRIMATIVE", release.version.String()) case "manually chosen": log.Warn("attempting manual release", release.version.String()) + case "NOT READY": + log.Warn("attempting to release. TODO: recheck go.sum here", release.version.String()) + log.Warn("Sleep 10") + log.Sleep(10) default: log.Warn("what is this?", release.version.String(), release.status.String()) return @@ -402,11 +407,12 @@ func findNextDirty() bool { log.Info("findNextDirty()", repo.String(), goSumS, dirtyS) if goSumS == "PRIMATIVE" { - if dirtyS != "PERFECT" { - if setCurrentRepo(repo, "PRIMATIVE", "release new version") { + if setCurrentRepo(repo, "PRIMATIVE", "release new version") { + if release.version.String() == release.current.status.GetLastTagVersion() { + // everything is fine. the primative has already been released + } else { return true } - continue } continue }