dashboard: remove misc-compile-android builder
Fixes golang/go#35596
Updates golang/go#25963
Change-Id: I9db5154dcdd0e432dfe2d0d8697fedabed50a7ed
Reviewed-on: https://go-review.googlesource.com/c/build/+/207377
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
diff --git a/dashboard/builders.go b/dashboard/builders.go
index 1e9f82b..c6936b7 100644
--- a/dashboard/builders.go
+++ b/dashboard/builders.go
@@ -1526,7 +1526,7 @@
addMiscCompile("-freebsd", `^freebsd-(386|arm|arm64)\b`) // 3: 386, arm, arm64 (amd64 already trybot)
addMiscCompile("-netbsd", "^netbsd-") // 4: amd64, 386, arm, arm64
addMiscCompile("-openbsd", "^openbsd-") // 4: amd64, 386, arm, arm64
- addMiscCompile("-android", `^android-(386|arm|arm64)\b`) // 3: 386, arm, arm64 (amd64 already trybot)
+
// And 3 that don't fit above:
addMiscCompile("-other", "^(windows-arm|linux-s390x|dragonfly-amd64)$")
// TODO: Issue 25963, get the misc-compile trybots for
diff --git a/dashboard/builders_test.go b/dashboard/builders_test.go
index 017b3d7..4bb29ee 100644
--- a/dashboard/builders_test.go
+++ b/dashboard/builders_test.go
@@ -95,7 +95,6 @@
"linux-386",
"linux-amd64",
"linux-amd64-race",
- "misc-compile-android",
"misc-compile-other",
"misc-compile-darwin",
"misc-compile-linuxarm",
@@ -120,7 +119,6 @@
"linux-386",
"linux-amd64",
"linux-amd64-race",
- "misc-compile-android",
"misc-compile-other",
"misc-compile-darwin",
"misc-compile-linuxarm",
@@ -146,7 +144,6 @@
"linux-386",
"linux-amd64",
"linux-amd64-race",
- "misc-compile-android",
"misc-compile-darwin",
"misc-compile-freebsd",
"misc-compile-linuxarm",
@@ -757,6 +754,14 @@
done["nacl-386"] = true // removed in Go 1.14
done["nacl-arm"] = true // removed in Go 1.14
check := func(goos, goarch string) {
+ if goos == "android" {
+ // TODO(golang.org/issue/25963): support
+ // compilation-only Android trybots.
+ // buildall.bash doesn't set the environment
+ // up enough for e.g. compiling android-386
+ // from linux-amd64. (Issue #35596 too)
+ return
+ }
goosArch := goos + "-" + goarch
if done[goosArch] {
return
