@@ -122,10 +122,12 @@ var Builders = map[string]*BuildConfig{}
122
122
123
123
// GoBootstrap is the bootstrap Go version.
124
124
//
125
- // For bootstrap versions prior to Go 1.21.0,
126
- // bootstrap Go builds with this name must be in the buildlet bucket,
127
- // usually uploaded by 'genbootstrap -upload all'.
128
- const GoBootstrap = "go1.20.6"
125
+ // For bootstrap versions Go 1.21.0 and newer,
126
+ // bootstrap Go builds for Windows (only) with this name must be in the buildlet bucket,
127
+ // usually uploaded by 'genbootstrap -upload windows-*'.
128
+ // However, as of 2024-08-16 all existing coordinator builders for Windows have migrated
129
+ // to LUCI, so nothing needs to be done for Windows after all.
130
+ const GoBootstrap = "go1.22.6"
129
131
130
132
// Hosts contains the names and configs of all the types of
131
133
// buildlets. They can be VMs, containers, or dedicated machines.
@@ -444,10 +446,6 @@ var Hosts = map[string]*HostConfig{
444
446
IsReverse : true ,
445
447
ExpectNum : 2 ,
446
448
Owners : []* gophers.Person {gh ("mengzhuo" )},
447
-
448
- // Use go1.20.7 (slightly newer than the default go1.20.6 on 2023-08-18)
449
- // for https://go.dev/issue/62104#issuecomment-1683207172.
450
- GoBootstrap : "go1.20.7" ,
451
449
},
452
450
"host-linux-s390x" : {
453
451
Notes : "run by IBM" ,
@@ -664,9 +662,11 @@ type HostConfig struct {
664
662
// toolchain for each build, typically because it cannot download from
665
663
// storage.googleapis.com.
666
664
//
667
- // For bootstrap versions prior to Go 1.21.0,
668
- // a bootstrap toolchain built with that version must be in the buildlet bucket,
669
- // usually uploaded by 'genbootstrap -upload all'.
665
+ // For bootstrap versions Go 1.21.0 and newer,
666
+ // bootstrap Go builds for Windows (only) with that version must be in the buildlet bucket,
667
+ // usually uploaded by 'genbootstrap -upload windows-*'.
668
+ // However, as of 2024-08-16 all existing coordinator builders for Windows have migrated
669
+ // to LUCI, so nothing needs to be done for Windows after all.
670
670
//
671
671
// (See the GoBootstrapURL method.)
672
672
GoBootstrap string
0 commit comments