Skip to content

Commit

Permalink
internal/relui: write to "ready" file, fix signing arg
Browse files Browse the repository at this point in the history
Simply opening and closing a file isn't enough to create it.

Also, don't use path.Join on URLs: it converts gs://foo to gs:/foo which
is a very different URL.

For golang/go#51797.

Change-Id: Ic681e151f2a2258f93e055564589d4440358e954
Reviewed-on: https://go-review.googlesource.com/c/build/+/412390
Auto-Submit: Heschi Kreinick <[email protected]>
Run-TryBot: Heschi Kreinick <[email protected]>
Reviewed-by: Dmitri Shuralyov <[email protected]>
Reviewed-by: Dmitri Shuralyov <[email protected]>
TryBot-Result: Gopher Robot <[email protected]>
  • Loading branch information
heschi authored and gopherbot committed Jun 17, 2022
1 parent 3062ce6 commit d6ffeea
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion internal/relui/workflows.go
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,7 @@ func (w *sizeWriter) Write(p []byte) (n int, err error) {
}

func (tasks *BuildReleaseTasks) startSigningCommand(ctx *workflow.TaskContext, version string) (string, error) {
args := fmt.Sprintf("--relui_staging=%q", path.Join(tasks.ScratchURL, signingStagingDir(ctx, version)))
args := fmt.Sprintf("--relui_staging=%q", tasks.ScratchURL+"/"+signingStagingDir(ctx, version))
ctx.Printf("run signer with " + args)
return args, nil
}
Expand Down Expand Up @@ -614,6 +614,9 @@ func (tasks *BuildReleaseTasks) copyToStaging(ctx *workflow.TaskContext, version
if err != nil {
return nil, err
}
if _, err := out.Write([]byte("ready")); err != nil {
return nil, err
}
if err := out.Close(); err != nil {
return nil, err
}
Expand Down

0 comments on commit d6ffeea

Please sign in to comment.