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) }