CI: Refactor versions.go (#55238)

* Refactor versions.go * s/ReleaseModeConfig/BuildConfig
2022-09-16 06:26:33 -04:00
parent e4741ce8d6
commit 95512c19e0
8 changed files with 82 additions and 41 deletions
@@ -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)
 		}