Skip to content

Commit 0ff2193

Browse files
committed
dashboard, env/linux-x86-nacl: remove nacl builders and supporting files
Go 1.13 was the last release with nacl, and it's not supported by now. For golang/go#30439. Change-Id: Ic690aa388ab4505d5e755bbe40fed850a7300c69 Reviewed-on: https://go-review.googlesource.com/c/build/+/260200 Trust: Dmitri Shuralyov <[email protected]> Run-TryBot: Dmitri Shuralyov <[email protected]> TryBot-Result: Go Bot <[email protected]> Reviewed-by: Carlos Amedee <[email protected]>
1 parent d1ab7ac commit 0ff2193

File tree

8 files changed

+3
-156
lines changed

8 files changed

+3
-156
lines changed

cmd/coordinator/coordinator.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ func stagingClusterBuilders() map[string]*dashboard.BuildConfig {
450450
"linux-amd64",
451451
"linux-amd64-sid",
452452
"linux-amd64-clang",
453-
"nacl-amd64p32",
453+
"js-wasm",
454454
} {
455455
if c, ok := dashboard.Builders[name]; ok {
456456
m[name] = c
@@ -2962,7 +2962,7 @@ var errBuildletsGone = errors.New("runTests: dist test failed: all buildlets had
29622962

29632963
// runTests is only called for builders which support a split make/run
29642964
// (should be everything, at least soon). Currently (2015-05-27) iOS
2965-
// and Android and Nacl do not.
2965+
// and Android do not.
29662966
//
29672967
// After runTests completes, the caller must assume that st.bc might be invalid
29682968
// (It's possible that only one of the helper buildlets survived).

dashboard/builders.go

Lines changed: 1 addition & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,19 @@ var slowBotAliases = map[string]string{
2727
// Known missing builders:
2828
"openbsd-arm": "",
2929
"openbsd-arm64": "",
30-
"nacl-arm": "",
3130
"darwin-arm": "", // TODO(golang.org/issue/37611): Remove once port is removed.
3231
"darwin-arm64": "", // TODO(golang.org/issue/39782): Add builder for darwin/arm64.
3332

3433
"386": "linux-386",
3534
"aix": "aix-ppc64",
3635
"amd64": "linux-amd64",
37-
"amd64p32": "nacl-amd64p32",
3836
"android": "android-amd64-emu",
3937
"android-386": "android-386-emu",
4038
"android-amd64": "android-amd64-emu",
4139
"android-arm": "android-arm-corellium",
4240
"android-arm64": "android-arm64-corellium",
4341
"arm": "linux-arm",
4442
"arm64": "linux-arm64-packet",
45-
"arm64p32": "nacl-amd64p32",
4643
"darwin": "darwin-amd64-10_14",
4744
"darwin-386": "darwin-386-10_14", // TODO(golang.org/issue/37610): Remove when Go 1.14 is no longer supported.
4845
"darwin-amd64": "darwin-amd64-10_14",
@@ -73,9 +70,6 @@ var slowBotAliases = map[string]string{
7370
"mips64": "linux-mips64-rtrk",
7471
"mips64le": "linux-mips64le-mengzhuo",
7572
"mipsle": "linux-mipsle-rtrk",
76-
"nacl": "nacl-amd64p32",
77-
"nacl-387": "nacl-386",
78-
"nacl-arm64p32": "nacl-amd64p32",
7973
"netbsd": "netbsd-amd64-9_0",
8074
"netbsd-386": "netbsd-386-9_0",
8175
"netbsd-amd64": "netbsd-amd64-9_0",
@@ -157,12 +151,6 @@ var Hosts = map[string]*HostConfig{
157151
Notes: "for localhost development of buildlets/gomote/coordinator only",
158152
SSHUsername: os.Getenv("USER"),
159153
},
160-
"host-nacl": &HostConfig{
161-
Notes: "Container with Native Client binaries.",
162-
ContainerImage: "linux-x86-nacl:latest",
163-
buildletURLTmpl: "http://storage.googleapis.com/$BUCKET/buildlet.linux-amd64",
164-
env: []string{"GOROOT_BOOTSTRAP=/go1.4"},
165-
},
166154
"host-js-wasm": &HostConfig{
167155
Notes: "Container with node.js for testing js/wasm.",
168156
ContainerImage: "js-wasm:latest",
@@ -1060,9 +1048,6 @@ func (c *BuildConfig) AllScript() string {
10601048
if strings.HasPrefix(c.Name, "plan9-") {
10611049
return "src/all.rc"
10621050
}
1063-
if strings.HasPrefix(c.Name, "nacl-") {
1064-
return "src/nacltest.bash"
1065-
}
10661051
if strings.HasPrefix(c.Name, "misc-compile") {
10671052
return "src/buildall.bash"
10681053
}
@@ -1079,8 +1064,7 @@ func (c *BuildConfig) SplitMakeRun() bool {
10791064
switch c.AllScript() {
10801065
case "src/all.bash", "src/all.bat",
10811066
"src/race.bash", "src/race.bat",
1082-
"src/all.rc",
1083-
"src/nacltest.bash":
1067+
"src/all.rc":
10841068
// These we've verified to work.
10851069
return true
10861070
}
@@ -1254,9 +1238,6 @@ func (c *BuildConfig) MakeScript() string {
12541238
if strings.HasPrefix(c.Name, "plan9-") {
12551239
return "src/make.rc"
12561240
}
1257-
if strings.HasPrefix(c.Name, "nacl-") {
1258-
return "src/naclmake.bash"
1259-
}
12601241
return "src/make.bash"
12611242
}
12621243

@@ -1814,29 +1795,6 @@ func init() {
18141795
return run
18151796
},
18161797
})
1817-
addBuilder(BuildConfig{
1818-
Name: "nacl-386",
1819-
HostType: "host-nacl",
1820-
buildsRepo: func(repo, branch, goBranch string) bool {
1821-
// nacl support is removed in Go 1.14.
1822-
// TODO: Remove builder after Go 1.15 is out.
1823-
return repo == "go" && !atLeastGo1(goBranch, 14) && !strings.HasPrefix(goBranch, "dev.")
1824-
},
1825-
numTryTestHelpers: 3,
1826-
env: []string{"GOOS=nacl", "GOARCH=386", "GOHOSTOS=linux", "GOHOSTARCH=amd64"},
1827-
})
1828-
addBuilder(BuildConfig{
1829-
Name: "nacl-amd64p32",
1830-
HostType: "host-nacl",
1831-
buildsRepo: func(repo, branch, goBranch string) bool {
1832-
// nacl support is removed in Go 1.14.
1833-
// TODO: Remove builder after Go 1.15 is out.
1834-
return repo == "go" && !atLeastGo1(goBranch, 14) && !strings.HasPrefix(goBranch, "dev.")
1835-
},
1836-
tryBot: explicitTrySet("go"),
1837-
numTryTestHelpers: 3,
1838-
env: []string{"GOOS=nacl", "GOARCH=amd64p32", "GOHOSTOS=linux", "GOHOSTARCH=amd64"},
1839-
})
18401798
addBuilder(BuildConfig{
18411799
Name: "js-wasm",
18421800
HostType: "host-js-wasm",

dashboard/builders_test.go

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -420,17 +420,6 @@ func TestBuilderConfig(t *testing.T) {
420420
{b("android-amd64-emu", "go"), isBuilder},
421421
{b("android-386-emu", "go"), isBuilder},
422422

423-
// golang.org/doc/go1.13: "Go 1.13 is the last release
424-
// that will run on Native Client (NaCl)."
425-
{b("nacl-386", "go"), none},
426-
{b("[email protected]", "go"), none},
427-
{b("[email protected]", "go"), onlyPost},
428-
{b("nacl-386", "net"), none},
429-
{b("nacl-amd64p32", "go"), none},
430-
{b("[email protected]", "go"), none},
431-
{b("[email protected]", "go"), both},
432-
{b("nacl-amd64p32", "net"), none},
433-
434423
// Only test tip for js/wasm, and only for some repos:
435424
{b("js-wasm", "go"), both},
436425
{b("js-wasm", "arch"), onlyPost},

env/linux-x86-nacl/Dockerfile

Lines changed: 0 additions & 31 deletions
This file was deleted.

env/linux-x86-nacl/Makefile

Lines changed: 0 additions & 30 deletions
This file was deleted.

env/linux-x86-nacl/README

Lines changed: 0 additions & 19 deletions
This file was deleted.

env/linux-x86-nacl/go_nacl_386_exec

Lines changed: 0 additions & 10 deletions
This file was deleted.

env/linux-x86-nacl/go_nacl_amd64p32_exec

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)