Skip to content

Commit b850320

Browse files
dmitshurgopherbot
authored andcommitted
internal/task: order doc/next removal after api/next promotion
The TestCheckAPIFragments test in cmd/relnote looks at api/next content and requires doc/next to have corresponding entries. So, make sure that test is happy by starting to remove doc/next no sooner than api/next is promoted. We ran into this in CL 634057. For golang/go#70655. Change-Id: Ic4d23c00507f057daa0de2a38ef5e83150d6c0c4 Reviewed-on: https://go-review.googlesource.com/c/build/+/634044 Auto-Submit: Dmitri Shuralyov <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]> Reviewed-by: Michael Knyszek <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]>
1 parent 802d380 commit b850320

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

internal/relui/workflows.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,8 @@ func RegisterReleaseWorkflows(ctx context.Context, h *DefinitionHolder, build *B
314314
// Release notes.
315315
relnoteCLsChecked := wf.Action0(wd, "Check for open release note fragment CLs", cycle.CheckRelnoteCLs)
316316
nextRelnote := wf.Task2(wd, "Merge release note fragments and add to x/website", cycle.MergeNextRelnoteAndAddToWebsite, devVer, coordinators, wf.After(relnoteCLsChecked))
317-
wf.Action3(wd, "Remove release note fragments from main repo", cycle.RemoveNextRelnoteFromMainRepo, devVer, nextRelnote, coordinators)
317+
relnoteTest := wf.After(nextAPI) // cmd/relnote.TestCheckAPIFragments needs the API promotion to happen first.
318+
wf.Action3(wd, "Remove release note fragments from main repo", cycle.RemoveNextRelnoteFromMainRepo, devVer, nextRelnote, coordinators, relnoteTest)
318319

319320
h.RegisterDefinition(fmt.Sprintf("between freeze start and RC 1 for Go 1.%d", currentMajor+1), wd)
320321
}

0 commit comments

Comments
 (0)