From fab41f42d3e23c11651ab75413b01d97e5d37c30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?=
 <bjorn.erik.pedersen@gmail.com>
Date: Fri, 1 Feb 2019 09:44:12 +0100
Subject: [PATCH] common/hugo: Use official semver even for main releases

Closes #5639
---
 common/hugo/version.go      | 2 +-
 common/hugo/version_test.go | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/common/hugo/version.go b/common/hugo/version.go
index e9deb6acf..47641f10c 100644
--- 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 fb28750ec..08059189e 100644
--- 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) {