common/hugo: Use official semver even for main releases - hugo - [fork] hugo port for 9front
HTML git clone git@git.drkhsh.at/hugo.git
DIR Log
DIR Files
DIR Refs
DIR Submodules
DIR README
DIR LICENSE
---
DIR commit fab41f42d3e23c11651ab75413b01d97e5d37c30
DIR parent c7c66e664a5d19be3988ab27d3f8922fe473957c
HTML Author: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date: Fri, 1 Feb 2019 09:44:12 +0100
common/hugo: Use official semver even for main releases
Closes #5639
Diffstat:
M common/hugo/version.go | 2 +-
M common/hugo/version_test.go | 9 +++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
---
DIR diff --git a/common/hugo/version.go b/common/hugo/version.go
@@ -149,7 +149,7 @@ func BuildVersionString() string {
}
func version(version float32, patchVersion int, suffix string) string {
- if patchVersion > 0 {
+ if patchVersion > 0 || version > 0.53 {
return fmt.Sprintf("%.2f.%d%s", version, patchVersion, suffix)
}
return fmt.Sprintf("%.2f%s", version, suffix)
DIR diff --git a/common/hugo/version_test.go b/common/hugo/version_test.go
@@ -35,6 +35,15 @@ func TestHugoVersion(t *testing.T) {
require.False(t, nextVersionString.Eq("0.21"))
require.True(t, nextVersionString.Eq(nextVersionString))
require.Equal(t, "0.20.3", v.NextPatchLevel(3).String())
+
+ // We started to use full semver versions even for main
+ // releases in v0.54.0
+ v = Version{Number: 0.53, PatchLevel: 0}
+ require.Equal(t, "0.53", v.String())
+ require.Equal(t, "0.54.0", v.Next().String())
+ require.Equal(t, "0.55.0", v.Next().Next().String())
+ v = Version{Number: 0.54, PatchLevel: 0, Suffix: "-DEV"}
+ require.Equal(t, "0.54.0-DEV", v.String())
}
func TestCompareVersions(t *testing.T) {