Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

version: trim spaces from raw VERSION #1165

Merged
merged 2 commits into from
Feb 2, 2023
Merged

version: trim spaces from raw VERSION #1165

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
280caa4
version: simplify parsing logic
radeksimko Feb 2, 2023
aacd5a0
version: trim spaces from raw VERSION
radeksimko Feb 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package main

import (
_ "embed"
"strings"

goversion "github.com/hashicorp/go-version"
)
Expand All @@ -16,15 +17,10 @@ var (
//go:embed version/VERSION
rawVersion string

fullVersion = parseRawVersion(rawVersion)
version = goversion.Must(goversion.NewVersion(strings.TrimSpace(rawVersion)))
)

// VersionString returns the complete version string, including prerelease
func VersionString() string {
return fullVersion.String()
}

func parseRawVersion(rawVersion string) goversion.Version {
v := goversion.Must(goversion.NewVersion(rawVersion))
return *v
return version.String()
}