diff options
| -rw-r--r-- | cmd/release_config/release_config/main.go | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/cmd/release_config/release_config/main.go b/cmd/release_config/release_config/main.go index 101dbe381..54328068a 100644 --- a/cmd/release_config/release_config/main.go +++ b/cmd/release_config/release_config/main.go @@ -83,20 +83,24 @@ func main() { // We were told to guard operation and either we have no build flag, or it is False. // Write an empty file so that release_config.mk will use the old process. os.WriteFile(makefilePath, []byte{}, 0644) - } else if allMake { + return + } + // Write the makefile where release_config.mk is going to look for it. + err = configs.WriteMakefile(makefilePath, targetRelease) + if err != nil { + panic(err) + } + if allMake { // Write one makefile per release config, using the canonical release name. for k, _ := range configs.ReleaseConfigs { - makefilePath = filepath.Join(outputDir, fmt.Sprintf("release_config-%s-%s.mk", product, k)) - err = configs.WriteMakefile(makefilePath, k) - if err != nil { - panic(err) + if k != targetRelease { + makefilePath = filepath.Join(outputDir, fmt.Sprintf("release_config-%s-%s.mk", product, k)) + err = configs.WriteMakefile(makefilePath, k) + if err != nil { + panic(err) + } } } - } else { - err = configs.WriteMakefile(makefilePath, targetRelease) - if err != nil { - panic(err) - } } if json { err = configs.WriteArtifact(outputDir, product, "json") |