Skip to content

Commit 0ef48a1

Browse files
thatnealpateldr2chase
authored andcommitted
internal/relui: fold SecurityReleaseCoalesceTask into main workflow
The SecurityReleaseCoalesceTask becomes a new prerequisite step to the minor release workflow; it keeps all of its prior semantics and execution flow with minor changes to support idempotent workflow runs in the larger minor release context. For golang/go#79034 For golang/go#78458 Change-Id: I76948fa0c8e4d46a0053e14030bd6b36a66e68af Reviewed-on: https://go-review.googlesource.com/c/build/+/801102 Reviewed-by: Nicholas Husin <nsh@golang.org> Reviewed-by: Nicholas Husin <husin@google.com> Reviewed-by: Neal Patel <nealpatel@google.com> LUCI-TryBot-Result: golang-scoped@luci-project-accounts.iam.gserviceaccount.com <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
1 parent 402b4ef commit 0ef48a1

9 files changed

Lines changed: 1754 additions & 738 deletions

File tree

cmd/relui/main.go

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,7 @@ func main() {
309309
V3: github.NewClient(githubHTTPClient),
310310
V4: githubv4.NewClient(githubHTTPClient),
311311
}
312+
buildTasks.GitHub = githubClient
312313
milestoneTasks := &task.MilestoneTasks{
313314
Client: githubClient,
314315
RepoOwner: "golang",
@@ -416,18 +417,14 @@ func main() {
416417
PublicRepoURL: func(repo string) string {
417418
return "https://go.googlesource.com/" + repo
418419
},
420+
GitHub: githubClient,
419421
ApproveAction: relui.ApproveActionDep(dbPool),
420422
SendMail: mailFunc,
421423
AnnounceMailHeader: annMail,
424+
AwaitAnnounceMail: commTasks.AnnounceMailTasks.AwaitAnnounceMail,
422425
}
423426
dh.RegisterDefinition("Publish a private patch to a x/ repo", privateXPatchTask.NewDefinition(tagTasks))
424427

425-
securityReleaseCoalesceTask := &task.SecurityReleaseCoalesceTask{
426-
PrivateGerrit: privateGerritClient,
427-
Version: versionTasks,
428-
}
429-
dh.RegisterDefinition("Prepare internal security release branches", securityReleaseCoalesceTask.NewDefinition())
430-
431428
var base *url.URL
432429
if *baseURL != "" {
433430
base, err = url.Parse(*baseURL)

0 commit comments

Comments
 (0)