Skip to content

Commit

Permalink
main.star: drop 1.19 and 1.20 from TOOLS_GO_BRANCHES
Browse files Browse the repository at this point in the history 
The Go 1.23.0 release is out. This drops many of the special cased
extra branches for x/tools per plan in go.dev/issue/65917, keeping
only go1.21 as a special case for the needs of gopls v0.17.0.

For golang/go#65917.

Change-Id: I2af34126099b58f6445a5198f2b06c654df0ae6d
Reviewed-on: https://go-review.googlesource.com/c/build/+/605000
Reviewed-by: Carlos Amedee <[email protected]>
Reviewed-by: Robert Findley <[email protected]>
LUCI-TryBot-Result: Go LUCI <[email protected]>
Auto-Submit: Dmitri Shuralyov <[email protected]>
  • Loading branch information
@dmitshur @gopherbot
dmitshur authored and gopherbot committed Sep 6, 2024
1 parent 9bb6fe5 commit ebde997
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 281 deletions.
10 changes: 0 additions & 10 deletions generated/commit-queue.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77566,16 +77566,6 @@ config_groups {
}
mode_allowlist: "ANALYZER_RUN"
}
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 {
name: "golang/try/x_tools-go1.21-linux-amd64"
disable_reuse: true
Expand Down
208 changes: 0 additions & 208 deletions generated/cr-buildbucket.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149416,110 +149416,6 @@ buckets {
enable: true
}
}
builders {
name: "x_tools-go1.19-linux-amd64"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cipd_platform:linux-amd64"
dimensions: "machine_type:n1-standard-16"
dimensions: "os:Debian-11"
dimensions: "pool:luci.golang.ci-workers"
exe {
cipd_package: "infra/experimental/golangbuild/${platform}"
cipd_version: "latest"
cmd: "golangbuild"
}
properties:
'{'
' "bootstrap_version": "1.17.13",'
' "env": {},'
' "git_cache": "git",'
' "go_branch": "release-branch.go1.19",'
' "host": {'
' "goarch": "amd64",'
' "goos": "linux"'
' },'
' "is_google": true,'
' "mode": 0,'
' "no_network": true,'
' "project": "tools",'
' "target": {'
' "goarch": "amd64",'
' "goos": "linux"'
' },'
' "tools_cache": "tools"'
'}'
priority: 40
expiration_secs: 21600
wait_for_capacity: NO
caches {
name: "git"
path: "git"
}
caches {
name: "tools"
path: "tools"
}
service_account: "[email protected]"
experiments {
key: "golang.shard_by_weight"
value: 100
}
resultdb {
enable: true
}
}
builders {
name: "x_tools-go1.20-linux-amd64"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cipd_platform:linux-amd64"
dimensions: "machine_type:n1-standard-16"
dimensions: "os:Debian-11"
dimensions: "pool:luci.golang.ci-workers"
exe {
cipd_package: "infra/experimental/golangbuild/${platform}"
cipd_version: "latest"
cmd: "golangbuild"
}
properties:
'{'
' "bootstrap_version": "1.17.13",'
' "env": {},'
' "git_cache": "git",'
' "go_branch": "release-branch.go1.20",'
' "host": {'
' "goarch": "amd64",'
' "goos": "linux"'
' },'
' "is_google": true,'
' "mode": 0,'
' "no_network": true,'
' "project": "tools",'
' "target": {'
' "goarch": "amd64",'
' "goos": "linux"'
' },'
' "tools_cache": "tools"'
'}'
priority: 40
expiration_secs: 21600
wait_for_capacity: NO
caches {
name: "git"
path: "git"
}
caches {
name: "tools"
path: "tools"
}
service_account: "[email protected]"
experiments {
key: "golang.shard_by_weight"
value: 100
}
resultdb {
enable: true
}
}
builders {
name: "x_tools-go1.21-linux-amd64"
swarming_host: "chromium-swarm.appspot.com"
Expand Down Expand Up @@ -423120,110 +423016,6 @@ buckets {
enable: true
}
}
builders {
name: "x_tools-go1.19-linux-amd64"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cipd_platform:linux-amd64"
dimensions: "machine_type:n1-standard-16"
dimensions: "os:Debian-11"
dimensions: "pool:luci.golang.try-workers"
exe {
cipd_package: "infra/experimental/golangbuild/${platform}"
cipd_version: "latest"
cmd: "golangbuild"
}
properties:
'{'
' "bootstrap_version": "1.17.13",'
' "env": {},'
' "git_cache": "git",'
' "go_branch": "release-branch.go1.19",'
' "host": {'
' "goarch": "amd64",'
' "goos": "linux"'
' },'
' "is_google": true,'
' "mode": 0,'
' "no_network": true,'
' "project": "tools",'
' "target": {'
' "goarch": "amd64",'
' "goos": "linux"'
' },'
' "tools_cache": "tools"'
'}'
priority: 30
expiration_secs: 21600
wait_for_capacity: NO
caches {
name: "git"
path: "git"
}
caches {
name: "tools"
path: "tools"
}
service_account: "[email protected]"
experiments {
key: "golang.shard_by_weight"
value: 100
}
resultdb {
enable: true
}
}
builders {
name: "x_tools-go1.20-linux-amd64"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cipd_platform:linux-amd64"
dimensions: "machine_type:n1-standard-16"
dimensions: "os:Debian-11"
dimensions: "pool:luci.golang.try-workers"
exe {
cipd_package: "infra/experimental/golangbuild/${platform}"
cipd_version: "latest"
cmd: "golangbuild"
}
properties:
'{'
' "bootstrap_version": "1.17.13",'
' "env": {},'
' "git_cache": "git",'
' "go_branch": "release-branch.go1.20",'
' "host": {'
' "goarch": "amd64",'
' "goos": "linux"'
' },'
' "is_google": true,'
' "mode": 0,'
' "no_network": true,'
' "project": "tools",'
' "target": {'
' "goarch": "amd64",'
' "goos": "linux"'
' },'
' "tools_cache": "tools"'
'}'
priority: 30
expiration_secs: 21600
wait_for_capacity: NO
caches {
name: "git"
path: "git"
}
caches {
name: "tools"
path: "tools"
}
service_account: "[email protected]"
experiments {
key: "golang.shard_by_weight"
value: 100
}
resultdb {
enable: true
}
}
builders {
name: "x_tools-go1.21-linux-amd64"
swarming_host: "chromium-swarm.appspot.com"
Expand Down
22 changes: 0 additions & 22 deletions generated/luci-milo.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12594,14 +12594,6 @@ consoles {
name: "buildbucket/luci.golang.ci/x_tools-go1.21-linux-amd64"
category: "linux|amd64"
}
builders {
name: "buildbucket/luci.golang.ci/x_tools-go1.20-linux-amd64"
category: "linux|amd64"
}
builders {
name: "buildbucket/luci.golang.ci/x_tools-go1.19-linux-amd64"
category: "linux|amd64"
}
}
consoles {
id: "x-tools-go1.23"
Expand Down Expand Up @@ -25736,14 +25728,6 @@ consoles {
name: "buildbucket/luci.golang.ci/x_tools-go1.21-linux-amd64"
category: "linux|amd64"
}
builders {
name: "buildbucket/luci.golang.ci/x_tools-go1.20-linux-amd64"
category: "linux|amd64"
}
builders {
name: "buildbucket/luci.golang.ci/x_tools-go1.19-linux-amd64"
category: "linux|amd64"
}
}
consoles {
id: "x-tools-go1.23-by-go"
Expand Down Expand Up @@ -38400,12 +38384,6 @@ consoles {
builders {
name: "buildbucket/luci.golang.ci/x_tools-go1.21-linux-amd64"
}
builders {
name: "buildbucket/luci.golang.ci/x_tools-go1.20-linux-amd64"
}
builders {
name: "buildbucket/luci.golang.ci/x_tools-go1.19-linux-amd64"
}
builders {
name: "buildbucket/luci.golang.ci/x_tools-go1.23-linux-amd64"
}
Expand Down
36 changes: 0 additions & 36 deletions generated/luci-scheduler.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44493,38 +44493,6 @@ job {
builder: "x_time-gotip-windows-arm64"
}
}
job {
id: "x_tools-go1.19-linux-amd64"
realm: "ci"
triggering_policy {
kind: NEWEST_FIRST
max_concurrent_invocations: 5
pending_timeout {
seconds: 604800
}
}
buildbucket {
server: "cr-buildbucket.appspot.com"
bucket: "ci"
builder: "x_tools-go1.19-linux-amd64"
}
}
job {
id: "x_tools-go1.20-linux-amd64"
realm: "ci"
triggering_policy {
kind: NEWEST_FIRST
max_concurrent_invocations: 5
pending_timeout {
seconds: 604800
}
}
buildbucket {
server: "cr-buildbucket.appspot.com"
bucket: "ci"
builder: "x_tools-go1.20-linux-amd64"
}
}
job {
id: "x_tools-go1.21-linux-amd64"
realm: "ci"
Expand Down Expand Up @@ -58413,8 +58381,6 @@ trigger {
trigger {
id: "tools-gotip-go-trigger"
realm: "ci"
triggers: "x_tools-go1.19-linux-amd64"
triggers: "x_tools-go1.20-linux-amd64"
triggers: "x_tools-go1.21-linux-amd64"
triggers: "x_tools-gotip-darwin-amd64-longtest"
triggers: "x_tools-gotip-darwin-amd64-nocgo"
Expand Down Expand Up @@ -58452,8 +58418,6 @@ trigger {
trigger {
id: "tools-gotip-trigger"
realm: "ci"
triggers: "x_tools-go1.19-linux-amd64"
triggers: "x_tools-go1.20-linux-amd64"
triggers: "x_tools-go1.21-linux-amd64"
triggers: "x_tools-gotip-darwin-amd64-longtest"
triggers: "x_tools-gotip-darwin-amd64-nocgo"
Expand Down
8 changes: 3 additions & 5 deletions main.star
View file
Original file line number Diff line number Diff line change
Expand Up @@ -561,11 +561,10 @@ INTERNAL_GO_BRANCHES = {
# because they're out of scope per https://go.dev/doc/devel/release#policy,
# but are used by only by the golang.org/x/tools repository for a while longer.
#
# This is planned to be removed soon after Go 1.23.0 per go.dev/issue/65917.
# TODO(go.dev/issue/65917): Come back to this after followup discussion;
# this special case for the go1.21 branch covers gopls v0.17.0 needs.
TOOLS_GO_BRANCHES = {
"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),
"go1.21": struct(branch = "release-branch.go1.21", bootstrap = "1.17.13"),
}

# We set build priorities by environment. These should always be lower than the
Expand Down Expand Up @@ -2045,7 +2044,6 @@ 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 ebde997

Please sign in to comment.