Skip to content

Commit ebde997

Browse files
dmitshurgopherbot
dmitshur
authored and
gopherbot
committed
main.star: drop 1.19 and 1.20 from TOOLS_GO_BRANCHES
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]>
1 parent 9bb6fe5 commit ebde997

File tree

5 files changed

+3
-281
lines changed

5 files changed

+3
-281
lines changed

‎generated/commit-queue.cfg

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77566,16 +77566,6 @@ config_groups {
7756677566
}
7756777567
mode_allowlist: "ANALYZER_RUN"
7756877568
}
77569-
builders {
77570-
name: "golang/try/x_tools-go1.19-linux-amd64"
77571-
includable_only: true
77572-
disable_reuse: true
77573-
}
77574-
builders {
77575-
name: "golang/try/x_tools-go1.20-linux-amd64"
77576-
includable_only: true
77577-
disable_reuse: true
77578-
}
7757977569
builders {
7758077570
name: "golang/try/x_tools-go1.21-linux-amd64"
7758177571
disable_reuse: true

‎generated/cr-buildbucket.cfg

Lines changed: 0 additions & 208 deletions
Original file line numberDiff line numberDiff line change
@@ -149416,110 +149416,6 @@ buckets {
149416149416
enable: true
149417149417
}
149418149418
}
149419-
builders {
149420-
name: "x_tools-go1.19-linux-amd64"
149421-
swarming_host: "chromium-swarm.appspot.com"
149422-
dimensions: "cipd_platform:linux-amd64"
149423-
dimensions: "machine_type:n1-standard-16"
149424-
dimensions: "os:Debian-11"
149425-
dimensions: "pool:luci.golang.ci-workers"
149426-
exe {
149427-
cipd_package: "infra/experimental/golangbuild/${platform}"
149428-
cipd_version: "latest"
149429-
cmd: "golangbuild"
149430-
}
149431-
properties:
149432-
'{'
149433-
' "bootstrap_version": "1.17.13",'
149434-
' "env": {},'
149435-
' "git_cache": "git",'
149436-
' "go_branch": "release-branch.go1.19",'
149437-
' "host": {'
149438-
' "goarch": "amd64",'
149439-
' "goos": "linux"'
149440-
' },'
149441-
' "is_google": true,'
149442-
' "mode": 0,'
149443-
' "no_network": true,'
149444-
' "project": "tools",'
149445-
' "target": {'
149446-
' "goarch": "amd64",'
149447-
' "goos": "linux"'
149448-
' },'
149449-
' "tools_cache": "tools"'
149450-
'}'
149451-
priority: 40
149452-
expiration_secs: 21600
149453-
wait_for_capacity: NO
149454-
caches {
149455-
name: "git"
149456-
path: "git"
149457-
}
149458-
caches {
149459-
name: "tools"
149460-
path: "tools"
149461-
}
149462-
service_account: "[email protected]"
149463-
experiments {
149464-
key: "golang.shard_by_weight"
149465-
value: 100
149466-
}
149467-
resultdb {
149468-
enable: true
149469-
}
149470-
}
149471-
builders {
149472-
name: "x_tools-go1.20-linux-amd64"
149473-
swarming_host: "chromium-swarm.appspot.com"
149474-
dimensions: "cipd_platform:linux-amd64"
149475-
dimensions: "machine_type:n1-standard-16"
149476-
dimensions: "os:Debian-11"
149477-
dimensions: "pool:luci.golang.ci-workers"
149478-
exe {
149479-
cipd_package: "infra/experimental/golangbuild/${platform}"
149480-
cipd_version: "latest"
149481-
cmd: "golangbuild"
149482-
}
149483-
properties:
149484-
'{'
149485-
' "bootstrap_version": "1.17.13",'
149486-
' "env": {},'
149487-
' "git_cache": "git",'
149488-
' "go_branch": "release-branch.go1.20",'
149489-
' "host": {'
149490-
' "goarch": "amd64",'
149491-
' "goos": "linux"'
149492-
' },'
149493-
' "is_google": true,'
149494-
' "mode": 0,'
149495-
' "no_network": true,'
149496-
' "project": "tools",'
149497-
' "target": {'
149498-
' "goarch": "amd64",'
149499-
' "goos": "linux"'
149500-
' },'
149501-
' "tools_cache": "tools"'
149502-
'}'
149503-
priority: 40
149504-
expiration_secs: 21600
149505-
wait_for_capacity: NO
149506-
caches {
149507-
name: "git"
149508-
path: "git"
149509-
}
149510-
caches {
149511-
name: "tools"
149512-
path: "tools"
149513-
}
149514-
service_account: "[email protected]"
149515-
experiments {
149516-
key: "golang.shard_by_weight"
149517-
value: 100
149518-
}
149519-
resultdb {
149520-
enable: true
149521-
}
149522-
}
149523149419
builders {
149524149420
name: "x_tools-go1.21-linux-amd64"
149525149421
swarming_host: "chromium-swarm.appspot.com"
@@ -423120,110 +423016,6 @@ buckets {
423120423016
enable: true
423121423017
}
423122423018
}
423123-
builders {
423124-
name: "x_tools-go1.19-linux-amd64"
423125-
swarming_host: "chromium-swarm.appspot.com"
423126-
dimensions: "cipd_platform:linux-amd64"
423127-
dimensions: "machine_type:n1-standard-16"
423128-
dimensions: "os:Debian-11"
423129-
dimensions: "pool:luci.golang.try-workers"
423130-
exe {
423131-
cipd_package: "infra/experimental/golangbuild/${platform}"
423132-
cipd_version: "latest"
423133-
cmd: "golangbuild"
423134-
}
423135-
properties:
423136-
'{'
423137-
' "bootstrap_version": "1.17.13",'
423138-
' "env": {},'
423139-
' "git_cache": "git",'
423140-
' "go_branch": "release-branch.go1.19",'
423141-
' "host": {'
423142-
' "goarch": "amd64",'
423143-
' "goos": "linux"'
423144-
' },'
423145-
' "is_google": true,'
423146-
' "mode": 0,'
423147-
' "no_network": true,'
423148-
' "project": "tools",'
423149-
' "target": {'
423150-
' "goarch": "amd64",'
423151-
' "goos": "linux"'
423152-
' },'
423153-
' "tools_cache": "tools"'
423154-
'}'
423155-
priority: 30
423156-
expiration_secs: 21600
423157-
wait_for_capacity: NO
423158-
caches {
423159-
name: "git"
423160-
path: "git"
423161-
}
423162-
caches {
423163-
name: "tools"
423164-
path: "tools"
423165-
}
423166-
service_account: "[email protected]"
423167-
experiments {
423168-
key: "golang.shard_by_weight"
423169-
value: 100
423170-
}
423171-
resultdb {
423172-
enable: true
423173-
}
423174-
}
423175-
builders {
423176-
name: "x_tools-go1.20-linux-amd64"
423177-
swarming_host: "chromium-swarm.appspot.com"
423178-
dimensions: "cipd_platform:linux-amd64"
423179-
dimensions: "machine_type:n1-standard-16"
423180-
dimensions: "os:Debian-11"
423181-
dimensions: "pool:luci.golang.try-workers"
423182-
exe {
423183-
cipd_package: "infra/experimental/golangbuild/${platform}"
423184-
cipd_version: "latest"
423185-
cmd: "golangbuild"
423186-
}
423187-
properties:
423188-
'{'
423189-
' "bootstrap_version": "1.17.13",'
423190-
' "env": {},'
423191-
' "git_cache": "git",'
423192-
' "go_branch": "release-branch.go1.20",'
423193-
' "host": {'
423194-
' "goarch": "amd64",'
423195-
' "goos": "linux"'
423196-
' },'
423197-
' "is_google": true,'
423198-
' "mode": 0,'
423199-
' "no_network": true,'
423200-
' "project": "tools",'
423201-
' "target": {'
423202-
' "goarch": "amd64",'
423203-
' "goos": "linux"'
423204-
' },'
423205-
' "tools_cache": "tools"'
423206-
'}'
423207-
priority: 30
423208-
expiration_secs: 21600
423209-
wait_for_capacity: NO
423210-
caches {
423211-
name: "git"
423212-
path: "git"
423213-
}
423214-
caches {
423215-
name: "tools"
423216-
path: "tools"
423217-
}
423218-
service_account: "[email protected]"
423219-
experiments {
423220-
key: "golang.shard_by_weight"
423221-
value: 100
423222-
}
423223-
resultdb {
423224-
enable: true
423225-
}
423226-
}
423227423019
builders {
423228423020
name: "x_tools-go1.21-linux-amd64"
423229423021
swarming_host: "chromium-swarm.appspot.com"

‎generated/luci-milo.cfg

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12594,14 +12594,6 @@ consoles {
1259412594
name: "buildbucket/luci.golang.ci/x_tools-go1.21-linux-amd64"
1259512595
category: "linux|amd64"
1259612596
}
12597-
builders {
12598-
name: "buildbucket/luci.golang.ci/x_tools-go1.20-linux-amd64"
12599-
category: "linux|amd64"
12600-
}
12601-
builders {
12602-
name: "buildbucket/luci.golang.ci/x_tools-go1.19-linux-amd64"
12603-
category: "linux|amd64"
12604-
}
1260512597
}
1260612598
consoles {
1260712599
id: "x-tools-go1.23"
@@ -25736,14 +25728,6 @@ consoles {
2573625728
name: "buildbucket/luci.golang.ci/x_tools-go1.21-linux-amd64"
2573725729
category: "linux|amd64"
2573825730
}
25739-
builders {
25740-
name: "buildbucket/luci.golang.ci/x_tools-go1.20-linux-amd64"
25741-
category: "linux|amd64"
25742-
}
25743-
builders {
25744-
name: "buildbucket/luci.golang.ci/x_tools-go1.19-linux-amd64"
25745-
category: "linux|amd64"
25746-
}
2574725731
}
2574825732
consoles {
2574925733
id: "x-tools-go1.23-by-go"
@@ -38400,12 +38384,6 @@ consoles {
3840038384
builders {
3840138385
name: "buildbucket/luci.golang.ci/x_tools-go1.21-linux-amd64"
3840238386
}
38403-
builders {
38404-
name: "buildbucket/luci.golang.ci/x_tools-go1.20-linux-amd64"
38405-
}
38406-
builders {
38407-
name: "buildbucket/luci.golang.ci/x_tools-go1.19-linux-amd64"
38408-
}
3840938387
builders {
3841038388
name: "buildbucket/luci.golang.ci/x_tools-go1.23-linux-amd64"
3841138389
}

‎generated/luci-scheduler.cfg

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -44493,38 +44493,6 @@ job {
4449344493
builder: "x_time-gotip-windows-arm64"
4449444494
}
4449544495
}
44496-
job {
44497-
id: "x_tools-go1.19-linux-amd64"
44498-
realm: "ci"
44499-
triggering_policy {
44500-
kind: NEWEST_FIRST
44501-
max_concurrent_invocations: 5
44502-
pending_timeout {
44503-
seconds: 604800
44504-
}
44505-
}
44506-
buildbucket {
44507-
server: "cr-buildbucket.appspot.com"
44508-
bucket: "ci"
44509-
builder: "x_tools-go1.19-linux-amd64"
44510-
}
44511-
}
44512-
job {
44513-
id: "x_tools-go1.20-linux-amd64"
44514-
realm: "ci"
44515-
triggering_policy {
44516-
kind: NEWEST_FIRST
44517-
max_concurrent_invocations: 5
44518-
pending_timeout {
44519-
seconds: 604800
44520-
}
44521-
}
44522-
buildbucket {
44523-
server: "cr-buildbucket.appspot.com"
44524-
bucket: "ci"
44525-
builder: "x_tools-go1.20-linux-amd64"
44526-
}
44527-
}
4452844496
job {
4452944497
id: "x_tools-go1.21-linux-amd64"
4453044498
realm: "ci"
@@ -58413,8 +58381,6 @@ trigger {
5841358381
trigger {
5841458382
id: "tools-gotip-go-trigger"
5841558383
realm: "ci"
58416-
triggers: "x_tools-go1.19-linux-amd64"
58417-
triggers: "x_tools-go1.20-linux-amd64"
5841858384
triggers: "x_tools-go1.21-linux-amd64"
5841958385
triggers: "x_tools-gotip-darwin-amd64-longtest"
5842058386
triggers: "x_tools-gotip-darwin-amd64-nocgo"
@@ -58452,8 +58418,6 @@ trigger {
5845258418
trigger {
5845358419
id: "tools-gotip-trigger"
5845458420
realm: "ci"
58455-
triggers: "x_tools-go1.19-linux-amd64"
58456-
triggers: "x_tools-go1.20-linux-amd64"
5845758421
triggers: "x_tools-go1.21-linux-amd64"
5845858422
triggers: "x_tools-gotip-darwin-amd64-longtest"
5845958423
triggers: "x_tools-gotip-darwin-amd64-nocgo"

‎main.star

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -561,11 +561,10 @@ INTERNAL_GO_BRANCHES = {
561561
# because they're out of scope per https://go.dev/doc/devel/release#policy,
562562
# but are used by only by the golang.org/x/tools repository for a while longer.
563563
#
564-
# This is planned to be removed soon after Go 1.23.0 per go.dev/issue/65917.
564+
# TODO(go.dev/issue/65917): Come back to this after followup discussion;
565+
# this special case for the go1.21 branch covers gopls v0.17.0 needs.
565566
TOOLS_GO_BRANCHES = {
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),
567+
"go1.21": struct(branch = "release-branch.go1.21", bootstrap = "1.17.13"),
569568
}
570569

571570
# We set build priorities by environment. These should always be lower than the
@@ -2045,7 +2044,6 @@ def _define_go_ci():
20452044
luci.cq_tryjob_verifier(
20462045
builder = try_builder,
20472046
cq_group = cq_group.name,
2048-
includable_only = TOOLS_GO_BRANCHES[extra_go_release].optional_only,
20492047
disable_reuse = True,
20502048
)
20512049

0 commit comments

Comments
 (0)