CI: Refactor versions.go (#55238)
* Refactor versions.go * s/ReleaseModeConfig/BuildConfig
This commit is contained in:
@@ -26,7 +26,7 @@ func BuildBackend(ctx *cli.Context) error {
|
||||
}
|
||||
)
|
||||
|
||||
mode, err := config.GetVersion(metadata.ReleaseMode.Mode)
|
||||
buildConfig, err := config.GetBuildConfig(metadata.ReleaseMode.Mode)
|
||||
if err != nil {
|
||||
return fmt.Errorf("could not get version / package info for mode '%s': %w", metadata.ReleaseMode.Mode, err)
|
||||
}
|
||||
@@ -34,7 +34,7 @@ func BuildBackend(ctx *cli.Context) error {
|
||||
const grafanaDir = "."
|
||||
|
||||
log.Printf("Building Grafana back-end, version %q, %s edition, variants [%v]",
|
||||
version, edition, mode.Variants)
|
||||
version, edition, buildConfig.Variants)
|
||||
|
||||
p := syncutil.NewWorkerPool(cfg.NumWorkers)
|
||||
defer p.Close()
|
||||
@@ -44,7 +44,7 @@ func BuildBackend(ctx *cli.Context) error {
|
||||
}
|
||||
|
||||
g, _ := errutil.GroupWithContext(ctx.Context)
|
||||
for _, variant := range mode.Variants {
|
||||
for _, variant := range buildConfig.Variants {
|
||||
variant := variant
|
||||
|
||||
opts := grafana.BuildVariantOpts{
|
||||
|
||||
@@ -20,12 +20,12 @@ func BuildDocker(c *cli.Context) error {
|
||||
}
|
||||
|
||||
useUbuntu := c.Bool("ubuntu")
|
||||
verMode, err := config.GetVersion(metadata.ReleaseMode.Mode)
|
||||
buildConfig, err := config.GetBuildConfig(metadata.ReleaseMode.Mode)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
shouldSave := verMode.Docker.ShouldSave
|
||||
shouldSave := buildConfig.Docker.ShouldSave
|
||||
if shouldSave {
|
||||
if err := gcloud.ActivateServiceAccount(); err != nil {
|
||||
return err
|
||||
@@ -39,7 +39,7 @@ func BuildDocker(c *cli.Context) error {
|
||||
log.Printf("Building Docker images, version %s, %s edition, Ubuntu based: %v...", version, edition,
|
||||
useUbuntu)
|
||||
|
||||
for _, arch := range verMode.Docker.Architectures {
|
||||
for _, arch := range buildConfig.Docker.Architectures {
|
||||
if _, err := docker.BuildImage(version, arch, ".", useUbuntu, shouldSave, edition); err != nil {
|
||||
return cli.Exit(err.Error(), 1)
|
||||
}
|
||||
|
||||
@@ -21,7 +21,7 @@ func BuildInternalPlugins(c *cli.Context) error {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
verMode, err := config.GetVersion(metadata.ReleaseMode.Mode)
|
||||
buildConfig, err := config.GetBuildConfig(metadata.ReleaseMode.Mode)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -35,7 +35,7 @@ func BuildInternalPlugins(c *cli.Context) error {
|
||||
|
||||
var g *errutil.Group
|
||||
g, ctx = errutil.GroupWithContext(ctx)
|
||||
if err := plugins.Build(ctx, grafanaDir, p, g, verMode); err != nil {
|
||||
if err := plugins.Build(ctx, grafanaDir, p, g, buildConfig); err != nil {
|
||||
return cli.Exit(err.Error(), 1)
|
||||
}
|
||||
if err := g.Wait(); err != nil {
|
||||
|
||||
@@ -18,7 +18,7 @@ func StoreStorybook(c *cli.Context) error {
|
||||
return err
|
||||
}
|
||||
|
||||
verMode, err := config.GetVersion(metadata.ReleaseMode.Mode)
|
||||
buildConfig, err := config.GetBuildConfig(metadata.ReleaseMode.Mode)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -26,8 +26,8 @@ func StoreStorybook(c *cli.Context) error {
|
||||
return err
|
||||
}
|
||||
|
||||
storybookBucket := verMode.StorybookBucket
|
||||
srcPath := verMode.StorybookSrcDir
|
||||
storybookBucket := buildConfig.Buckets.Storybook
|
||||
srcPath := buildConfig.Buckets.StorybookSrcDir
|
||||
srcPath = filepath.Join(srcPath, deployment)
|
||||
|
||||
gcs, err := storage.New()
|
||||
|
||||
Reference in New Issue
Block a user