Skip to content

Commit 8014f11

Browse files
dmitshurgopherbot
authored andcommitted
internal/relui: handle error from loadBinaries
Caught while working on go.dev/issue/63147. For golang/go#61513. Change-Id: Ied9d3a6716759dfe40bf224f6b60bf733e07dc13 Cq-Include-Trybots: luci.golang.try:x_build-gotip-linux-amd64-longtest-race Reviewed-on: https://go-review.googlesource.com/c/build/+/552015 Auto-Submit: Dmitri Shuralyov <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]> Reviewed-by: Carlos Amedee <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]>
1 parent b676886 commit 8014f11

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

internal/relui/workflows.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -995,6 +995,9 @@ func (b *BuildReleaseTasks) modFilesFromBinary(ctx *wf.TaskContext, version stri
995995
func (b *BuildReleaseTasks) mergeSignedToTGZ(ctx *wf.TaskContext, unsigned, signed artifact) (artifact, error) {
996996
return b.runBuildStep(ctx, unsigned.Target, nil, signed, "tar.gz", func(_ *task.BuildletStep, signed io.Reader, w io.Writer) error {
997997
signedBinaries, err := loadBinaries(ctx, signed)
998+
if err != nil {
999+
return err
1000+
}
9981001

9991002
// Copy files from the tgz, overwriting with binaries from the signed tar.
10001003
ur, err := b.ScratchFS.OpenRead(ctx, unsigned.Scratch)
@@ -1049,6 +1052,9 @@ func (b *BuildReleaseTasks) mergeSignedToTGZ(ctx *wf.TaskContext, unsigned, sign
10491052
func (b *BuildReleaseTasks) mergeSignedToModule(ctx *wf.TaskContext, version string, timestamp time.Time, mod moduleArtifact, signed artifact) (moduleArtifact, error) {
10501053
a, err := b.runBuildStep(ctx, nil, nil, signed, "signedmod.zip", func(_ *task.BuildletStep, signed io.Reader, w io.Writer) error {
10511054
signedBinaries, err := loadBinaries(ctx, signed)
1055+
if err != nil {
1056+
return err
1057+
}
10521058

10531059
// Copy files from the module zip, overwriting with binaries from the signed tar.
10541060
mr, err := b.ScratchFS.OpenRead(ctx, mod.ZipScratch)

0 commit comments

Comments
 (0)