internal/relui: mail DL CLs after release approved

We put the DL CL early to avoid having to wait for proxy.golang.org, but now that we're prebuilding, it doesn't make so much sense: either it hangs around for days or we submit it way early. Move it to the rest of the publishing steps. For golang/go#53799. Change-Id: I12df3019c8278d7c72fe8dc308e209ff3bf5c131 Reviewed-on: https://go-review.googlesource.com/c/build/+/420543 TryBot-Result: Gopher Robot <[email protected]> Run-TryBot: Heschi Kreinick <[email protected]> Auto-Submit: Heschi Kreinick <[email protected]> Reviewed-by: Jenny Rakoczy <[email protected]>
golang · Aug 2, 2022 · 7a4b380 · 7a4b380
1 parent c752abf
commit 7a4b380
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/internal/relui/workflows.go b/internal/relui/workflows.go
@@ -551,9 +551,6 @@ func addSingleReleaseWorkflow(
 	nextVersion := wf.Task1(wd, "Get next version", version.GetNextVersion, kindVal)
 	milestones := wf.Task2(wd, "Pick milestones", milestone.FetchMilestones, nextVersion, kindVal)
 	checked := wf.Action3(wd, "Check blocking issues", milestone.CheckBlockers, milestones, nextVersion, kindVal)
-	dlcl := wf.Task2(wd, "Mail DL CL", version.MailDLCL, wf.Slice(nextVersion), wf.Const(false))
-	dlclCommit := wf.Task2(wd, "Wait for DL CL", version.AwaitCL, dlcl, wf.Const(""))
-	wf.Output(wd, "Download CL submitted", dlclCommit)
 
 	startSigner := wf.Task1(wd, "Start signing command", build.startSigningCommand, nextVersion)
 	wf.Output(wd, "Signing command", startSigner)
@@ -569,6 +566,10 @@ func addSingleReleaseWorkflow(
 
 	okayToTagAndPublish := wf.Action0(wd, "Wait for Release Coordinator Approval", build.ApproveAction, wf.After(signedAndTestedArtifacts))
 
+	dlcl := wf.Task2(wd, "Mail DL CL", version.MailDLCL, wf.Slice(nextVersion), wf.Const(false), wf.After(okayToTagAndPublish))
+	dlclCommit := wf.Task2(wd, "Wait for DL CL", version.AwaitCL, dlcl, wf.Const(""))
+	wf.Output(wd, "Download CL submitted", dlclCommit)
+
 	// Tag version and upload to CDN/website.
 	// If we're releasing a beta from master, tagging is easy; we just tag the
 	// commit we started from. Otherwise, we're going to submit a VERSION CL,