Skip to content

Commit c0d7a64

Browse files
dmitshurgopherbot
authored andcommitted
main.star: clean up after dropping release-branch.go1.22
Delete code that became dead as of CL 648675. Generated files unchanged. Change-Id: Icfe4fbc25c4e52135ebb12f38cf41d9484183a7c Reviewed-on: https://go-review.googlesource.com/c/build/+/648677 Reviewed-by: Cherry Mui <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]> Auto-Submit: Dmitri Shuralyov <[email protected]>
1 parent fa5874d commit c0d7a64

File tree

1 file changed

+8
-30
lines changed

1 file changed

+8
-30
lines changed

main.star

Lines changed: 8 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,6 @@ def is_first_class(goos, goarch):
259259
# GOOGLE_LOW_CAPACITY_HOSTS are low-capacity hosts that happen to be operated
260260
# by Google, so we can rely on them being available.
261261
GOOGLE_LOW_CAPACITY_HOSTS = [
262-
"darwin-amd64_10.15",
263262
"darwin-amd64_11",
264263
"darwin-amd64_12",
265264
"darwin-amd64_13",
@@ -409,7 +408,6 @@ BUILDER_TYPES = [
409408
"darwin-amd64-longtest",
410409
"darwin-amd64-nocgo",
411410
"darwin-amd64-race",
412-
"darwin-amd64_10.15",
413411
"darwin-amd64_11",
414412
"darwin-amd64_12",
415413
"darwin-amd64_13",
@@ -939,16 +937,11 @@ def define_for_projects_except(projects):
939937
def define_for_issue68798():
940938
def f(port, project, go_branch_short):
941939
exists = project in ["go", "tools"]
942-
if go_branch_short != "gotip" and go_branch_short <= "go1.22":
943-
# The builder exists as optional presubmit up to Go 1.22,
944-
# since gotypesalias=0 was the default back then and not
945-
# all tests are guaranteed to pass.
946-
presubmit, postsubmit = False, False
947-
else:
948-
# Starting with Go 1.23, gotypesalias=1 is the default, so
949-
# a builder that sets it explicitly in the environment is expected to be a no-op.
950-
# Run it anyway to confirm that's the case for reasons motivated in go.dev/issue/68798.
951-
presubmit, postsubmit = True, True
940+
941+
# Starting with Go 1.23, gotypesalias=1 is the default, so
942+
# a builder that sets it explicitly in the environment is expected to be a no-op.
943+
# Run it anyway to confirm that's the case for reasons motivated in go.dev/issue/68798.
944+
presubmit, postsubmit = True, True
952945
return (exists, presubmit, postsubmit, [])
953946

954947
return f
@@ -1648,7 +1641,6 @@ def define_builder(env, project, go_branch_short, builder_type):
16481641
if os == "darwin":
16491642
# See available versions with: cipd instances -limit 0 infra_internal/ios/xcode/mac | less
16501643
xcode_versions = {
1651-
10: "11e503a", # released Apr 2020, macOS 10.15 released Oct 2019
16521644
11: "12b45b", # released Nov 2020, macOS 11 released Nov 2020
16531645
12: "13c100", # released Dec 2021, macOS 12 released Oct 2021
16541646
13: "15c500b", # released Jan 2024, macOS 13.5 released Jul 2023
@@ -2002,36 +1994,23 @@ def enabled(low_capacity_hosts, project, go_branch_short, builder_type, known_is
20021994
return False, PRESUBMIT.DISABLED, False, []
20031995

20041996
# Filter out old OS versions from new branches.
2005-
if os == "darwin" and suffix == "10.15" and go_branch_short not in ["go1.22"]:
2006-
# Go 1.22 is last to support macOS 10.15. See go.dev/doc/go1.22#darwin.
2007-
return False, PRESUBMIT.DISABLED, False, []
2008-
elif os == "darwin" and suffix == "11" and go_branch_short not in ["go1.22", "go1.23", "go1.24"]:
1997+
if os == "darwin" and suffix == "11" and go_branch_short not in ["go1.23", "go1.24"]:
20091998
# Go 1.24 is last to support macOS 11. See go.dev/doc/go1.24#darwin.
20101999
return False, PRESUBMIT.DISABLED, False, []
20112000

20122001
# Filter out new ports on old release branches.
2013-
if os == "openbsd" and arch == "riscv64" and go_branch_short in ["go1.22"]:
2014-
# The openbsd/riscv64 port is new to Go 1.23.
2015-
return False, PRESUBMIT.DISABLED, False, []
2016-
if os == "freebsd" and arch == "amd64" and go_branch_short in ["go1.22", "go1.23"]:
2002+
if os == "freebsd" and arch == "amd64" and go_branch_short in ["go1.23"]:
20172003
freebsd_version = suffix
20182004
if freebsd_version == "":
20192005
freebsd_version = DEFAULT_HOST_SUFFIX[host_type]
20202006
if freebsd_version == "14.1":
20212007
# The 14.1 freebsd/amd64 LUCI builders need fixes that aren't available on old branches.
20222008
# Just disable the builder on these branches.
20232009
return False, PRESUBMIT.DISABLED, False, []
2024-
if os == "freebsd" and arch == "amd64" and "race" in run_mods and go_branch_short in ["go1.22", "go1.23", "go1.24"]:
2010+
if os == "freebsd" and arch == "amd64" and "race" in run_mods and go_branch_short in ["go1.23", "go1.24"]:
20252011
# The freebsd-amd64-race LUCI builders may need fixes that aren't available on old branches.
20262012
return False, PRESUBMIT.DISABLED, False, []
20272013

2028-
# Filter out new projects on old release branches.
2029-
if project == "oscar" and go_branch_short in ["go1.22"]:
2030-
return False, PRESUBMIT.DISABLED, False, []
2031-
if project == "pkgsite" and go_branch_short in ["go1.22"]:
2032-
# See CL 609142.
2033-
return False, PRESUBMIT.DISABLED, False, []
2034-
20352014
# Docker builder should only be used in VSCode-Go repo.
20362015
if suffix == "docker" and project != "vscode-go":
20372016
return False, PRESUBMIT.DISABLED, False, []
@@ -2380,7 +2359,6 @@ def _define_go_internal_ci():
23802359
# swarming instance. This requires additional resources and
23812360
# work to set up, hence each such host needs to opt-in here.
23822361
"linux-arm",
2383-
"darwin-amd64_10.15",
23842362
"darwin-amd64_11",
23852363
"darwin-amd64_12",
23862364
"darwin-amd64_13",

0 commit comments

Comments
 (0)