Merge pull request #41 from kichristensen/calculateVersionCorrectly

schristoff · web-flow · commit 081303e9427d · 2024-06-27T12:04:58.000-06:00
Calculate version correctly when multiple tags are present
diff --git a/releases/git.go b/releases/git.go
@@ -81,7 +81,7 @@ func getCommit() string {
 
 // Get a description of the commit, e.g. v0.30.1 (latest) or v0.30.1-32-gfe72ff73 (canary)
 func getVersion() string {
-	version, _ := shx.OutputS("git", "describe", "--tags")
+	version, _ := shx.OutputS("git", "describe", "--tags", "--match=v*")
 	if version != "" {
 		return version
 	}

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ func getCommit() string {`
`81`	`81`
`82`	`82`	`// Get a description of the commit, e.g. v0.30.1 (latest) or v0.30.1-32-gfe72ff73 (canary)`
`83`	`83`	`func getVersion() string {`
`84`		`- version, _ := shx.OutputS("git", "describe", "--tags")`
	`84`	`+ version, _ := shx.OutputS("git", "describe", "--tags", "--match=v*")`
`85`	`85`	`if version != "" {`
`86`	`86`	`return version`
`87`	`87`	`}`