From 858780dfcbce2ac418bf3fc5fe68b1cf860850d7 Mon Sep 17 00:00:00 2001 From: David Ashpole Date: Tue, 22 Aug 2023 16:49:10 -0400 Subject: [PATCH] fix release tool (#712) --- tools/release.go | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/tools/release.go b/tools/release.go index 954f738af..e00ecbf8e 100644 --- a/tools/release.go +++ b/tools/release.go @@ -84,14 +84,16 @@ func (m module) editRequirement(dep, version string) error { return nil } -func (m module) version() string { +func (m module) dir() string { modDir := filepath.Dir(string(m)) if modDir == "." { - modDir = "" - } else { - modDir += "/" + return "" } - return versionForPath(modDir) + return modDir + "/" +} + +func (m module) version() string { + return versionForPath(m.dir()) } func versionForPath(modDir string) string { @@ -153,9 +155,8 @@ func tag() error { if err != nil { return err } - for _, dir := range mods { - ver := versionForPath(string(dir)) - tag := string(dir) + "v" + ver + for _, m := range mods { + tag := m.dir() + "v" + m.version() fmt.Printf("Creating tag %s\n", tag) cmd := exec.Command("git", "tag", tag) cmd.Stderr = os.Stderr