Merge pull request #54 from cpanato/update-version

k8s-ci-robot · web-flow · commit bac167d269ee · 2022-06-13T02:28:12.000-07:00
return the git version from the one that is passed from the ldflags due to an issue in upstream
diff --git a/version/version.go b/version/version.go
@@ -84,6 +84,12 @@ func getGitVersion(bi *debug.BuildInfo) string {
 	if bi == nil {
 		return unknown
 	}
+
+	// TODO: remove this when the issue https://github.com/golang/go/issues/29228 is fixed
+	if bi.Main.Version == "(devel)" || bi.Main.Version == "" {
+		return gitVersion
+	}
+
 	return bi.Main.Version
 }
 

Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,12 @@ func getGitVersion(bi *debug.BuildInfo) string {`
`84`	`84`	`if bi == nil {`
`85`	`85`	`return unknown`
`86`	`86`	`}`
	`87`	`+`
	`88`	`+ // TODO: remove this when the issue https://github.com/golang/go/issues/29228 is fixed`
	`89`	`+ if bi.Main.Version == "(devel)" \|\| bi.Main.Version == "" {`
	`90`	`+ return gitVersion`
	`91`	`+ }`
	`92`	`+`
`87`	`93`	`return bi.Main.Version`
`88`	`94`	`}`
`89`	`95`