Skip to content

Commit

Permalink
main.star: make 1.19 and 1.20 TOOLS_GO_BRANCHES trybots optional
Browse files Browse the repository at this point in the history
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 <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Auto-Submit: Dmitri Shuralyov <dmitshur@golang.org>
Reviewed-by: Robert Findley <rfindley@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
  • Loading branch information
dmitshur authored and gopherbot committed Sep 3, 2024
1 parent 073c026 commit c97d742
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
2 changes: 2 additions & 0 deletions generated/commit-queue.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -77548,10 +77548,12 @@ config_groups {
}
builders {
name: "golang/try/x_tools-go1.19-linux-amd64"
includable_only: true
disable_reuse: true
}
builders {
name: "golang/try/x_tools-go1.20-linux-amd64"
includable_only: true
disable_reuse: true
}
builders {
Expand Down
7 changes: 4 additions & 3 deletions main.star
Original file line number Diff line number Diff line change
Expand Up @@ -563,9 +563,9 @@ INTERNAL_GO_BRANCHES = {
#
# This is planned to be removed soon after Go 1.23.0 per go.dev/issue/65917.
TOOLS_GO_BRANCHES = {
"go1.21": struct(branch = "release-branch.go1.21", bootstrap = "1.17.13"),
"go1.20": struct(branch = "release-branch.go1.20", bootstrap = "1.17.13"),
"go1.19": struct(branch = "release-branch.go1.19", bootstrap = "1.17.13"),
"go1.21": struct(branch = "release-branch.go1.21", bootstrap = "1.17.13", optional_only = False),
"go1.20": struct(branch = "release-branch.go1.20", bootstrap = "1.17.13", optional_only = True),
"go1.19": struct(branch = "release-branch.go1.19", bootstrap = "1.17.13", optional_only = True),
}

# We set build priorities by environment. These should always be lower than the
Expand Down Expand Up @@ -2046,6 +2046,7 @@ def _define_go_ci():
luci.cq_tryjob_verifier(
builder = try_builder,
cq_group = cq_group.name,
includable_only = TOOLS_GO_BRANCHES[extra_go_release].optional_only,
disable_reuse = True,
)

Expand Down

0 comments on commit c97d742

Please sign in to comment.