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

Bug: Fix build-frontend* config checks (#70076)

Browse Source 
* Fix frontend config checks

* Exclude test tag events
This commit is contained in:
Dimitris Sotirakis
2023-06-14 17:34:30 +03:00
committed by GitHub
parent 193247bc73
commit 5a36fa5f8a
6 changed files with 67 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/build/cmd/buildfrontend.go
+1 -2
View File
@@ -16,9 +16,8 @@ func BuildFrontend(c *cli.Context) error {
if err != nil {
return err
}
version := metadata.GrafanaVersion
cfg, mode, err := frontend.GetConfig(c, version)
cfg, mode, err := frontend.GetConfig(c, metadata)
if err != nil {
return err
}
pkg/build/cmd/buildfrontendpackages.go
+6 -11
View File
@@ -2,26 +2,21 @@ package main
import (
"log"
"strings"
"github.com/urfave/cli/v2"
"github.com/grafana/grafana/pkg/build/config"
"github.com/grafana/grafana/pkg/build/errutil"
"github.com/grafana/grafana/pkg/build/frontend"
"github.com/grafana/grafana/pkg/build/syncutil"
"github.com/urfave/cli/v2"
)
func BuildFrontendPackages(c *cli.Context) error {
version := ""
if c.NArg() == 1 {
// Fixes scenario where an incompatible semver is provided to lerna, which will cause the step to fail.
// When there is an invalid semver, a frontend package won't be published anyways.
if strings.Count(version, ".") == 2 {
version = strings.TrimPrefix(c.Args().Get(0), "v")
}
metadata, err := config.GenerateMetadata(c)
if err != nil {
return err
}
cfg, mode, err := frontend.GetConfig(c, version)
cfg, mode, err := frontend.GetConfig(c, metadata)
if err != nil {
return err
}