mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Grafana versioning: Remove pre suffix from Grafana version (#73357)
* Remove pre suffix from version * Fix tests
This commit is contained in:
committed by
GitHub
parent
24978eff61
commit
0aba319ea0
@@ -18,7 +18,7 @@ const (
|
||||
)
|
||||
|
||||
const (
|
||||
hashedGrafanaVersion = "9.2.0-12345pre"
|
||||
hashedGrafanaVersion = "9.2.0-12345"
|
||||
versionedBranch = "v9.2.x"
|
||||
)
|
||||
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user