From ffecf5ea0aca03385bc024db194079df4a4599df Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Fri, 14 Feb 2025 00:43:16 -0600 Subject: [PATCH] finally am checking for duplicate tags correctly. maybe. --- findNext.go | 2 +- prepareRelease.go | 25 ++++++++++++++++++++++++- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/findNext.go b/findNext.go index de6365d..2990072 100644 --- a/findNext.go +++ b/findNext.go @@ -93,8 +93,8 @@ func findNext() bool { } else { if err := testGoDepsCheckOk(godepsNew, argv.Verbose); err != nil { log.Info("CHECKING current repo deps failed", err) + continue } - continue } /* findCounter += 1 diff --git a/prepareRelease.go b/prepareRelease.go index c847bce..fdfda13 100644 --- a/prepareRelease.go +++ b/prepareRelease.go @@ -150,7 +150,25 @@ func rePrepareRelease() { log.Info("old vs new count", b1, b2, "git merge", oldlhash) } - // if b1 == 0 && b2 == 0 { + if b1 == 0 && b2 == 0 { + log.Info("got to identical repo", check.GetGoPath(), b1, b2) + log.Info("got to identical repo", check.GetGoPath(), oldlhash, newmhash) + // actually identical. do nothing + continue + } + if b1 == 0 && b2 == 1 { + if check.GetGoPath() == "go.wit.com/log" { + log.Info("edge case. don't retag.", check.GetGoPath(), b1, b2) + log.Info("edge case. don't retag.", check.GetGoPath(), oldlhash, newmhash) + } + // actually identical. do nothing + continue + } + if check.GetGoPath() == "go.wit.com/log" { + log.Info("got to log", b1, b2) + log.Info("got to log", oldlhash, newmhash) + os.Exit(-1) + } if gitpb.IsGoTagVersionGreater(lastTag, master) { // this function is not right really. the hash error above should catch it correctly // log.Printf("PROBABLY NOT NEE %-50s tag %s < %s\n", check.GetGoPath(), lastTag, master) @@ -182,6 +200,11 @@ func rePrepareRelease() { continue } + if check.GetGoPath() == "go.wit.com/log" { + log.Info("got to log") + os.Exit(-1) + } + // if the repo is a go binary or plugin for a new release for // any library version change // if check.GetRepoType() == "binary" || check.GetRepoType() == "plugin" {