Skip to content
Snippets Groups Projects
Unverified Commit 69727f27 authored by Silas Davis's avatar Silas Davis
Browse files

Deduplicate version number and bump

parent 90626504
No related branches found
No related tags found
No related merge requests found
......@@ -35,7 +35,7 @@ var BurrowClientCmd = &cobra.Command{
Made with <3 by Monax Industries.
Complete documentation is available at https://monax.io/docs
` + "\nVERSION:\n " + version.VERSION,
` + "\nVERSION:\n " + version.GetSemanticVersionString(),
Run: func(cmd *cobra.Command, args []string) { cmd.Help() },
}
......
......@@ -34,7 +34,7 @@ your needs.
Made with <3 by Monax Industries.
Complete documentation is available at https://monax.io/docs
` + "\nVERSION:\n " + version.VERSION,
` + "\nVERSION:\n " + version.GetSemanticVersionString(),
Run: func(cmd *cobra.Command, args []string) { cmd.Help() },
}
......
......@@ -22,5 +22,5 @@ import (
// Print the Burrow version
func main() {
fmt.Println(version.VERSION)
fmt.Println(version.GetSemanticVersionString())
}
......@@ -32,7 +32,7 @@ const (
// Minor version component of the current release
versionMinor = 17
// Patch version component of the current release
versionPatch = 0
versionPatch = 1
)
var burrowVersion *VersionIdentifier
......@@ -92,6 +92,13 @@ func (v *VersionIdentifier) GetMinorVersionString() string {
v.MinorVersion)
}
// Return the plain version string without the ClientIdentifier
func GetSemanticVersionString() string { return burrowVersion.GetSemanticVersionString() }
func (v *VersionIdentifier) GetSemanticVersionString() string {
return fmt.Sprintf("%d.%d.%d", v.MajorVersion,
v.MinorVersion, v.PatchVersion)
}
// note: similar remark applies here on the use of `int` over `uint8`
// for the arguments as above for MakeVersionString()
func MakeMinorVersionString(client string, major, minor, patch int) string {
......@@ -125,8 +132,3 @@ func (version *VersionIdentifier) MatchesMinorVersion(
version.MajorVersion == referenceMajor &&
version.MinorVersion == referenceMinor
}
//------------------------------------------------------------------------------
// util/version/cmd prints this when run and is used to by build_tool.sh to obtain
// Burrow version
const VERSION = "0.17.0"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment