Skip to content

Commit 8583c1a

Browse files
dmitshurgopherbot
authored andcommitted
internal/relui: update major release x/tools generate sequence
CL 567837 extracted the stdlib manifest from x/tools/internal/imports to x/tools/internal/stdlib. That is the new package that will need to be regenerated every 6 months after each major Go release. Update the relui task that automated that recurring work accordingly. For golang/go#46136. For golang/go#38706. Change-Id: I9705ac881a18a5e7b03188228eadfaccf816aaca Reviewed-on: https://go-review.googlesource.com/c/build/+/572777 Auto-Submit: Dmitri Shuralyov <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]> Reviewed-by: Alan Donovan <[email protected]>
1 parent 7c2d52f commit 8583c1a

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

internal/relui/buildrelease_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ case "$1" in
7777
echo "tidied!" >> go.mod
7878
;;
7979
"generate")
80-
mkdir -p internal/imports
81-
cd internal/imports && echo "package imports" >> zstdlib.go
80+
mkdir -p internal/stdlib
81+
cd internal/stdlib && echo "package stdlib" >> manifest.go
8282
;;
8383
*)
8484
echo unexpected command $@

internal/relui/workflows.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -485,9 +485,9 @@ func addSingleReleaseWorkflow(
485485
pushed := wf.Action3(wd, "Push issues", milestone.PushIssues, milestones, nextVersion, kindVal, wf.After(tagged))
486486
published := wf.Task2(wd, "Publish to website", build.publishArtifacts, nextVersion, signedAndTestedArtifacts, wf.After(uploaded, availableOnProxy, pushed))
487487
if kind == task.KindMajor {
488-
goimportsCL := wf.Task2(wd, fmt.Sprintf("Mail goimports CL for 1.%d", major), version.CreateUpdateStdlibIndexCL, coordinators, nextVersion, wf.After(published))
489-
goimportsCommit := wf.Task2(wd, "Wait for goimports CL submission", version.AwaitCL, goimportsCL, wf.Const(""))
490-
wf.Output(wd, "goimports CL submitted", goimportsCommit)
488+
xToolsStdlibCL := wf.Task2(wd, fmt.Sprintf("Mail x/tools stdlib CL for 1.%d", major), version.CreateUpdateStdlibIndexCL, coordinators, nextVersion, wf.After(published))
489+
xToolsStdlibCommit := wf.Task2(wd, "Wait for x/tools stdlib CL submission", version.AwaitCL, xToolsStdlibCL, wf.Const(""))
490+
wf.Output(wd, "x/tools stdlib CL submitted", xToolsStdlibCommit)
491491
}
492492

493493
dockerBuild := wf.Task1(wd, "Start Google Docker build", build.runGoogleDockerBuild, nextVersion, wf.After(uploaded))

internal/task/version.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ func (t *VersionTasks) TagRelease(ctx *workflow.TaskContext, version, commit str
216216
}
217217

218218
func (t *VersionTasks) CreateUpdateStdlibIndexCL(ctx *workflow.TaskContext, reviewers []string, version string) (string, error) {
219-
build, err := t.CloudBuild.RunScript(ctx, "go generate ./internal/imports", "tools", []string{"internal/imports/zstdlib.go"})
219+
build, err := t.CloudBuild.RunScript(ctx, "go generate ./internal/stdlib", "tools", []string{"internal/stdlib/manifest.go"})
220220
if err != nil {
221221
return "", err
222222
}
@@ -228,7 +228,7 @@ func (t *VersionTasks) CreateUpdateStdlibIndexCL(ctx *workflow.TaskContext, revi
228228

229229
changeInput := gerrit.ChangeInput{
230230
Project: "tools",
231-
Subject: fmt.Sprintf("internal/imports: update stdlib index for %s\n\nFor golang/go#38706.", strings.Replace(version, "go", "Go ", 1)),
231+
Subject: fmt.Sprintf("internal/stdlib: update stdlib index for %s\n\nFor golang/go#38706.", strings.Replace(version, "go", "Go ", 1)),
232232
Branch: "master",
233233
}
234234
return t.Gerrit.CreateAutoSubmitChange(ctx, changeInput, reviewers, files)

0 commit comments

Comments
 (0)