Skip to content

Commit 4662d0f

Browse files
committed
dashboard, cmd/buildlet: add Windows XP builder
Updates golang/go#10267 Change-Id: I79064d9a2aca11bc14c73beef44d70098ed1ae3f Reviewed-on: https://go-review.googlesource.com/83055 Reviewed-by: Brad Fitzpatrick <[email protected]>
1 parent 3c0fd3c commit 4662d0f

File tree

3 files changed

+31
-1
lines changed

3 files changed

+31
-1
lines changed

cmd/buildlet/Makefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ compile:
1919
GOOS=linux GOARCH=s390x go install golang.org/x/build/cmd/buildlet
2020
GOOS=darwin GOARCH=amd64 go install golang.org/x/build/cmd/buildlet
2121
GOOS=windows GOARCH=amd64 go install golang.org/x/build/cmd/buildlet
22+
GOOS=windows GOARCH=386 go install golang.org/x/build/cmd/buildlet
2223
GOOS=freebsd GOARCH=amd64 go install golang.org/x/build/cmd/buildlet
2324
GOOS=netbsd GOARCH=amd64 go install golang.org/x/build/cmd/buildlet
2425
GOOS=openbsd GOARCH=amd64 go install golang.org/x/build/cmd/buildlet
@@ -70,6 +71,10 @@ buildlet.windows-amd64: FORCE buildlet_windows.go
7071
go install golang.org/x/build/cmd/upload
7172
upload --verbose --osarch=$@ --file=go:golang.org/x/build/cmd/buildlet --public --cacheable=false go-builder-data/$@
7273

74+
buildlet.windows-386: FORCE buildlet_windows.go
75+
go install golang.org/x/build/cmd/upload
76+
upload --verbose --osarch=$@ --file=go:golang.org/x/build/cmd/buildlet --public --cacheable=false go-builder-data/$@
77+
7378
buildlet.linux-arm: FORCE
7479
go install golang.org/x/build/cmd/upload
7580
upload --verbose --osarch=$@ --file=go:golang.org/x/build/cmd/buildlet --public --cacheable=false go-builder-data/$@

cmd/buildlet/stage0/stage0.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,8 @@ Download:
164164
cmd.Args = append(cmd.Args,
165165
scalewayArgs...,
166166
)
167+
case "host-windows-386-xp":
168+
cmd.Args = append(cmd.Args, reverseHostTypeArgs("host-windows-386-xp")...)
167169
}
168170
switch osArch {
169171
case "linux/s390x":
@@ -299,8 +301,11 @@ func isNetworkUp() bool {
299301
}
300302

301303
func buildletURL() string {
302-
if os.Getenv("GO_BUILDER_ENV") == "linux-arm-arm5spacemonkey" {
304+
switch os.Getenv("GO_BUILDER_ENV") {
305+
case "linux-arm-arm5spacemonkey":
303306
return "https://storage.googleapis.com/go-builder-data/buildlet.linux-arm-arm5"
307+
case "host-windows-386-xp":
308+
return "https://storage.googleapis.com/go-builder-data/buildlet.windows-386"
304309
}
305310
switch osArch {
306311
case "linux/s390x":

dashboard/builders.go

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,21 @@ var Hosts = map[string]*HostConfig{
254254
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/go1.4-windows-amd64.tar.gz",
255255
SSHUsername: "gopher",
256256
},
257+
// We only test Windows XP on 32-bit, because only less than
258+
// 1% of XP users ever had 64-bit XP, according to numbers
259+
// found online. And we test XP at all because it's the oldest
260+
// Windows we claim to support, so let's see if it remains
261+
// true, until we decide to not support it.
262+
"host-windows-386-xp": &HostConfig{
263+
Notes: "VMware instance run by Brad. No cgo. XP SP3.",
264+
OwnerGithub: "bradfitz",
265+
IsReverse: true,
266+
ExpectNum: 1,
267+
env: []string{
268+
"CGO_ENABLED=0",
269+
`GOROOT_BOOTSTRAP=C:\Documents and Settings\winxp\go1.4`,
270+
},
271+
},
257272
"host-darwin-10_8": &HostConfig{
258273
IsReverse: true,
259274
ExpectNum: 1,
@@ -1170,6 +1185,11 @@ func init() {
11701185
Notes: "Only runs -race tests (./race.bat)",
11711186
env: []string{"GOARCH=amd64", "GOHOSTARCH=amd64"},
11721187
})
1188+
addBuilder(BuildConfig{
1189+
Name: "windows-386-xp",
1190+
HostType: "host-windows-386-xp",
1191+
MaxAtOnce: 1, // only one anyway
1192+
})
11731193
addBuilder(BuildConfig{
11741194
Name: "darwin-amd64-10_8",
11751195
HostType: "host-darwin-10_8",

0 commit comments

Comments
 (0)