Skip to content

Commit 357881e

Browse files
dmitshurgopherbot
authored andcommitted
cmd/relui: add await step for goimports CL, remove ad-hoc workflow
The ad-hoc workflow was successfully used to generate CL 464875 and won't be needed anymore, so drop it. Add a "await CL" step so there's a lightweight indicator of when the goimports CL is submitted, like we have for the DL CL and version CL. It's a leaf task that doesn't block any other Go release process work, but helps make it so that when the overall workflow is completed, we know there's nothing more that needs attention. Fixes golang/go#54377. Change-Id: I00cfd851677e0c6c0041f4f2b913e7740b3f7ab4 Reviewed-on: https://go-review.googlesource.com/c/build/+/464915 Reviewed-by: Carlos Amedee <[email protected]> TryBot-Result: Gopher Robot <[email protected]> Run-TryBot: Dmitri Shuralyov <[email protected]> Auto-Submit: Dmitri Shuralyov <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]>
1 parent dd73d1b commit 357881e

File tree

1 file changed

+4
-15
lines changed

1 file changed

+4
-15
lines changed

internal/relui/workflows.go

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -256,18 +256,6 @@ func RegisterReleaseWorkflows(ctx context.Context, h *DefinitionHolder, build *B
256256
h.RegisterDefinition("pre-announce "+r.name, wd)
257257
}
258258

259-
// Register a one-off "update stdlib index CL"-only workflow for Go 1.20.
260-
// See go.dev/issue/58227 and go.dev/issue/58228 for context on why this is needed.
261-
{
262-
wd := wf.New()
263-
264-
coordinators := wf.Param(wd, releaseCoordinators)
265-
updateStdlibIndexCL := wf.Task2(wd, "Mail update stdlib index CL for 1.20", version.CreateUpdateStdlibIndexCL, coordinators, wf.Const("go1.20"))
266-
wf.Output(wd, "Stdlib regeneration CL", updateStdlibIndexCL)
267-
268-
h.RegisterDefinition("Mail CL to regenerate x/tools/internal/imports after 1.20 release", wd)
269-
}
270-
271259
// Register dry-run release workflows.
272260
registerBuildTestSignOnlyWorkflow(h, version, build, currentMajor+1, task.KindBeta)
273261

@@ -387,7 +375,7 @@ func addSingleReleaseWorkflow(
387375
okayToTagAndPublish := wf.Action0(wd, "Wait for Release Coordinator Approval", build.ApproveAction, wf.After(signedAndTestedArtifacts))
388376

389377
dlcl := wf.Task3(wd, "Mail DL CL", version.MailDLCL, wf.Slice(nextVersion), coordinators, wf.Const(false), wf.After(okayToTagAndPublish))
390-
dlclCommit := wf.Task2(wd, "Wait for DL CL", version.AwaitCL, dlcl, wf.Const(""))
378+
dlclCommit := wf.Task2(wd, "Wait for DL CL submission", version.AwaitCL, dlcl, wf.Const(""))
391379
wf.Output(wd, "Download CL submitted", dlclCommit)
392380

393381
// Tag version and upload to CDN/website.
@@ -407,8 +395,9 @@ func addSingleReleaseWorkflow(
407395
pushed := wf.Action3(wd, "Push issues", milestone.PushIssues, milestones, nextVersion, kindVal, wf.After(tagged))
408396
versionPublished = wf.Task2(wd, "Publish to website", build.publishArtifacts, nextVersion, signedAndTestedArtifacts, wf.After(uploaded, pushed))
409397
if kind == task.KindMajor {
410-
updateStdlibIndexCL := wf.Task2(wd, fmt.Sprintf("Mail update stdlib index CL for 1.%d", major), version.CreateUpdateStdlibIndexCL, coordinators, versionPublished)
411-
wf.Output(wd, "Stdlib regeneration CL", updateStdlibIndexCL)
398+
goimportsCL := wf.Task2(wd, fmt.Sprintf("Mail goimports CL for 1.%d", major), version.CreateUpdateStdlibIndexCL, coordinators, versionPublished)
399+
goimportsCommit := wf.Task2(wd, "Wait for goimports CL submission", version.AwaitCL, goimportsCL, wf.Const(""))
400+
wf.Output(wd, "goimports CL submitted", goimportsCommit)
412401
}
413402
wf.Output(wd, "Released version", versionPublished)
414403
return versionPublished

0 commit comments

Comments
 (0)