public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[v10.1.x] Grafana versioning: Remove pre suffix from Grafana version (#73367)

Browse Source 
Grafana versioning: Remove `pre` suffix from Grafana version (#73357)

* Remove pre suffix from version

* Fix tests

(cherry picked from commit 0aba319ea0)

Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
This commit is contained in:
grafana-delivery-bot[bot]
2023-08-17 11:24:46 +03:00
committed by GitHub
co-authored by Dimitris Sotirakis
parent 0674b66255
commit c6a309f2ad
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/build/config/genmetadata_test.go
+1 -1
View File
@@ -18,7 +18,7 @@ const (
) )
const ( const (
hashedGrafanaVersion = "9.2.0-12345pre" hashedGrafanaVersion = "9.2.0-12345"
versionedBranch = "v9.2.x" versionedBranch = "v9.2.x"
) )
pkg/build/config/version.go
-3
View File
@@ -81,9 +81,6 @@ func GenerateGrafanaVersion(buildID, grafanaDir string) (string, error) {
buildID = shortenBuildID(buildID) buildID = shortenBuildID(buildID)
verComponents := strings.Split(version, "-") verComponents := strings.Split(version, "-")
version = verComponents[0] version = verComponents[0]
if len(verComponents) > 1 {
buildID = fmt.Sprintf("%s%s", buildID, verComponents[1])
}
version = fmt.Sprintf("%s-%s", version, buildID) version = fmt.Sprintf("%s-%s", version, buildID)
} }