From c6a309f2ad2c8a10312a6c8b1385cce34aad17d7 Mon Sep 17 00:00:00 2001 From: "grafana-delivery-bot[bot]" <132647405+grafana-delivery-bot[bot]@users.noreply.github.com> Date: Thu, 17 Aug 2023 11:24:46 +0300 Subject: [PATCH] [v10.1.x] Grafana versioning: Remove `pre` suffix from Grafana version (#73367) Grafana versioning: Remove `pre` suffix from Grafana version (#73357) * Remove pre suffix from version * Fix tests (cherry picked from commit 0aba319ea04378b4e64335e365236155135185a0) Co-authored-by: Dimitris Sotirakis --- pkg/build/config/genmetadata_test.go | 2 +- pkg/build/config/version.go | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/pkg/build/config/genmetadata_test.go b/pkg/build/config/genmetadata_test.go index 78413e2b7aa..d8eeb06bb6a 100644 --- a/pkg/build/config/genmetadata_test.go +++ b/pkg/build/config/genmetadata_test.go @@ -18,7 +18,7 @@ const ( ) const ( - hashedGrafanaVersion = "9.2.0-12345pre" + hashedGrafanaVersion = "9.2.0-12345" versionedBranch = "v9.2.x" ) diff --git a/pkg/build/config/version.go b/pkg/build/config/version.go index 6ce1bcae867..5eb96ab63f3 100644 --- a/pkg/build/config/version.go +++ b/pkg/build/config/version.go @@ -81,9 +81,6 @@ func GenerateGrafanaVersion(buildID, grafanaDir string) (string, error) { buildID = shortenBuildID(buildID) verComponents := strings.Split(version, "-") version = verComponents[0] - if len(verComponents) > 1 { - buildID = fmt.Sprintf("%s%s", buildID, verComponents[1]) - } version = fmt.Sprintf("%s-%s", version, buildID) }