Skip to content

Commit 746a6d3

Browse files
heschigopherbot
authored andcommitted
cmd/release: remove -tarball support, no longer needed
It was only used by security releases. For golang/go#51797. Change-Id: I241cfe23797f21daded434b1baa91386097bf8a0 Reviewed-on: https://go-review.googlesource.com/c/build/+/394362 Trust: Heschi Kreinick <[email protected]> Run-TryBot: Heschi Kreinick <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]> Auto-Submit: Heschi Kreinick <[email protected]> TryBot-Result: Gopher Robot <[email protected]>
1 parent 9adcb24 commit 746a6d3

File tree

1 file changed

+8
-21
lines changed

1 file changed

+8
-21
lines changed

cmd/release/release.go

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ var (
4242

4343
stagingDir = flag.String("staging_dir", "", "If specified, use this as the staging directory for untested release artifacts. Default is the system temporary directory.")
4444

45-
rev = flag.String("rev", "", "Go revision to build, alternative to -tarball")
46-
tarball = flag.String("tarball", "", "Go tree tarball to build, alternative to -rev")
45+
rev = flag.String("rev", "", "Go revision to build")
4746
version = flag.String("version", "", "Version string (go1.5.2)")
4847
user = flag.String("user", username(), "coordinator username, appended to 'user-'")
4948
skipTests = flag.Bool("skip_tests", false, "skip tests; run make.bash but not all.bash (only use if sufficient testing was done elsewhere)")
@@ -70,8 +69,8 @@ func main() {
7069
return
7170
}
7271

73-
if (*rev == "" && *tarball == "") || (*rev != "" && *tarball != "") {
74-
log.Fatal("must specify one of -rev or -tarball")
72+
if *rev == "" {
73+
log.Fatal("must specify -rev")
7574
}
7675
if *version == "" {
7776
log.Fatal(`must specify -version flag (such as "go1.12" or "go1.13beta1")`)
@@ -361,23 +360,11 @@ func (b *Build) make() error {
361360
goPath = "gopath"
362361
go14 = "go1.4"
363362
)
364-
if *tarball != "" {
365-
tarFile, err := os.Open(*tarball)
366-
if err != nil {
367-
b.logf("failed to open tarball %q: %v", *tarball, err)
368-
return err
369-
}
370-
if err := client.PutTar(ctx, tarFile, goDir); err != nil {
371-
b.logf("failed to put tarball %q into dir %q: %v", *tarball, goDir, err)
372-
return err
373-
}
374-
tarFile.Close()
375-
} else {
376-
tar := "https://go.googlesource.com/go/+archive/" + *rev + ".tar.gz"
377-
if err := client.PutTarFromURL(ctx, tar, goDir); err != nil {
378-
b.logf("failed to put tarball %q into dir %q: %v", tar, goDir, err)
379-
return err
380-
}
363+
364+
tar := "https://go.googlesource.com/go/+archive/" + *rev + ".tar.gz"
365+
if err := client.PutTarFromURL(ctx, tar, goDir); err != nil {
366+
b.logf("failed to put tarball %q into dir %q: %v", tar, goDir, err)
367+
return err
381368
}
382369

383370
if u := bc.GoBootstrapURL(buildEnv); u != "" && !b.Source {

0 commit comments

Comments
 (0)