common/hugo: Use official semver even for main releases

Closes #5639

diff --git a/common/hugo/version.go b/common/hugo/version.go
index e9deb6acf97935e96dc6e66a57e5187e120a7654..47641f10c09e50ec9aa06a26b70b826758893d7a 100644 (file)
--- 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)

diff --git a/common/hugo/version_test.go b/common/hugo/version_test.go
index fb28750ecd8e40539b10999e30f7a03c232c8a17..08059189e09fe1f0be47236313dc2c6ec8654133 100644 (file)
--- 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) {