Skip to content

Commit c97d742

Browse files
dmitshurgopherbot
authored andcommitted
main.star: make 1.19 and 1.20 TOOLS_GO_BRANCHES trybots optional
We still want to be able to trigger them in the very immediate future, but they don't need to be included by default and block submission. For golang/go#65917. Change-Id: I2d8d0602c631bd7335488c4c473081812fc07dde Reviewed-on: https://go-review.googlesource.com/c/build/+/610395 LUCI-TryBot-Result: Go LUCI <[email protected]> Auto-Submit: Dmitri Shuralyov <[email protected]> Reviewed-by: Robert Findley <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]>
1 parent 073c026 commit c97d742

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

generated/commit-queue.cfg

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77548,10 +77548,12 @@ config_groups {
7754877548
}
7754977549
builders {
7755077550
name: "golang/try/x_tools-go1.19-linux-amd64"
77551+
includable_only: true
7755177552
disable_reuse: true
7755277553
}
7755377554
builders {
7755477555
name: "golang/try/x_tools-go1.20-linux-amd64"
77556+
includable_only: true
7755577557
disable_reuse: true
7755677558
}
7755777559
builders {

main.star

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -563,9 +563,9 @@ INTERNAL_GO_BRANCHES = {
563563
#
564564
# This is planned to be removed soon after Go 1.23.0 per go.dev/issue/65917.
565565
TOOLS_GO_BRANCHES = {
566-
"go1.21": struct(branch = "release-branch.go1.21", bootstrap = "1.17.13"),
567-
"go1.20": struct(branch = "release-branch.go1.20", bootstrap = "1.17.13"),
568-
"go1.19": struct(branch = "release-branch.go1.19", bootstrap = "1.17.13"),
566+
"go1.21": struct(branch = "release-branch.go1.21", bootstrap = "1.17.13", optional_only = False),
567+
"go1.20": struct(branch = "release-branch.go1.20", bootstrap = "1.17.13", optional_only = True),
568+
"go1.19": struct(branch = "release-branch.go1.19", bootstrap = "1.17.13", optional_only = True),
569569
}
570570

571571
# We set build priorities by environment. These should always be lower than the
@@ -2046,6 +2046,7 @@ def _define_go_ci():
20462046
luci.cq_tryjob_verifier(
20472047
builder = try_builder,
20482048
cq_group = cq_group.name,
2049+
includable_only = TOOLS_GO_BRANCHES[extra_go_release].optional_only,
20492050
disable_reuse = True,
20502051
)
20512052

0 commit comments

Comments
 (0)