fix versions

sreya · sreya · commit 51301d92c29c · 2022-06-28T21:51:40.000Z
diff --git a/buildinfo/buildinfo.go b/buildinfo/buildinfo.go
@@ -3,6 +3,7 @@ package buildinfo
 import (
 	"fmt"
 	"runtime/debug"
+	"strings"
 	"sync"
 	"time"
 
@@ -58,7 +59,9 @@ func Version() string {
 // disregarded. If it detects that either version is a developer build it
 // returns true.
 func VersionsMatch(v1, v2 string) bool {
-	if semver.Prerelease(v1) == "-devel" || semver.Prerelease(v2) == "-devel" {
+	// Developer versions are disregarded...hopefully they know what they are
+	// doing.
+	if strings.HasPrefix(v1, develPrefix) || strings.HasPrefix(v2, develPrefix) {
 		return true
 	}
 
diff --git a/cli/root.go b/cli/root.go
@@ -384,7 +384,7 @@ to download the appropriate version run 'curl -L https://coder.com/install.sh |
 	if !buildinfo.VersionsMatch(clientVersion, info.Version) {
 		warn := cliui.Styles.Warn.Copy().Align(lipgloss.Left)
 		// Trim the leading 'v', our install.sh script does not handle this case well.
-		_, _ = fmt.Fprintf(cmd.OutOrStdout(), warn.Render(fmtWarningText), clientVersion, info.Version, info.TrimmedVersion()[1:])
+		_, _ = fmt.Fprintf(cmd.OutOrStdout(), warn.Render(fmtWarningText), clientVersion, info.Version, strings.TrimPrefix(info.CanonicalVersion(), "v"))
 		_, _ = fmt.Fprintln(cmd.OutOrStdout())
 	}
 
diff --git a/codersdk/buildinfo.go b/codersdk/buildinfo.go
@@ -19,10 +19,12 @@ type BuildInfoResponse struct {
 	Version string `json:"version"`
 }
 
-// TrimmedVersion trims build information from the version.
+// CanonicalVersion trims build information from the version.
 // E.g. 'v0.7.4-devel+11573034' -> 'v0.7.4'.
-func (b BuildInfoResponse) TrimmedVersion() string {
-	trimmed := strings.ReplaceAll(b.Version, "-devel", "+devel")
+func (b BuildInfoResponse) CanonicalVersion() string {
+	// We do a little hack here to massage the string into a form
+	// that works well with semver.
+	trimmed := strings.ReplaceAll(b.Version, "-devel+", "+devel-")
 	return semver.Canonical(trimmed)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -384,7 +384,7 @@ to download the appropriate version run 'curl -L https://coder.com/install.sh \|`
`384`	`384`	`if !buildinfo.VersionsMatch(clientVersion, info.Version) {`
`385`	`385`	`warn := cliui.Styles.Warn.Copy().Align(lipgloss.Left)`
`386`	`386`	`// Trim the leading 'v', our install.sh script does not handle this case well.`
`387`		`- _, _ = fmt.Fprintf(cmd.OutOrStdout(), warn.Render(fmtWarningText), clientVersion, info.Version, info.TrimmedVersion()[1:])`
	`387`	`+ _, _ = fmt.Fprintf(cmd.OutOrStdout(), warn.Render(fmtWarningText), clientVersion, info.Version, strings.TrimPrefix(info.CanonicalVersion(), "v"))`
`388`	`388`	`_, _ = fmt.Fprintln(cmd.OutOrStdout())`
`389`	`389`	`}`
`390`	`390`
Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,12 @@ type BuildInfoResponse struct {`
`19`	`19`	Version string `json:"version"`
`20`	`20`	`}`
`21`	`21`
`22`		`-// TrimmedVersion trims build information from the version.`
	`22`	`+// CanonicalVersion trims build information from the version.`
`23`	`23`	`// E.g. 'v0.7.4-devel+11573034' -> 'v0.7.4'.`
`24`		`-func (b BuildInfoResponse) TrimmedVersion() string {`
`25`		`- trimmed := strings.ReplaceAll(b.Version, "-devel", "+devel")`
	`24`	`+func (b BuildInfoResponse) CanonicalVersion() string {`
	`25`	`+ // We do a little hack here to massage the string into a form`
	`26`	`+ // that works well with semver.`
	`27`	`+ trimmed := strings.ReplaceAll(b.Version, "-devel+", "+devel-")`
`26`	`28`	`return semver.Canonical(trimmed)`
`27`	`29`	`}`
`28`	`30`