Skip to content

Commit 55e1ef6

Browse files
committed
dashboard: remove misc-compile-ios builder
Since sending CL 257617, I've learned that iOS was never a supported target for misc-compile. It was always filtered out unconditionally in GOROOT/src/buildall.bash, and the comment suggesting that we test iOS targets was inaccurate. Remove the naive misc-compile-ios builder since it's not expected to start working soon, and update misc-builder architecture filtering code and comments to match the current reality better. After this change, it will be viable to remove mobile target filtering from GOROOT/src/buildall.bash. If that's done, then x/build/dashboard will become a centralized place for all misc-builder target selection. Ignore darwin-arm in TestTryBotsCompileAllPorts so the test doesn't fail when executed with Go 1.14. Not having that builder is intended. For golang/go#41610. Updates golang/go#25963. Change-Id: Ic6f5dc95edb67f8e6ebc0a77979e55eb0cc325cb Reviewed-on: https://go-review.googlesource.com/c/build/+/258057 Run-TryBot: Dmitri Shuralyov <[email protected]> TryBot-Result: Go Bot <[email protected]> Trust: Dmitri Shuralyov <[email protected]> Reviewed-by: Alexander Rakoczy <[email protected]>
1 parent 034e344 commit 55e1ef6

File tree

2 files changed

+12
-27
lines changed

2 files changed

+12
-27
lines changed

dashboard/builders.go

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1551,7 +1551,7 @@ func init() {
15511551
})
15521552
}
15531553
addMiscCompile("-linuxarm", "^linux-arm") // 2: arm, arm64
1554-
addMiscCompile("-darwin", "^darwin") // 2: amd64, arm64 (for Go 1.14 and older, 4: 386, amd64 + iOS: arm, arm64)
1554+
addMiscCompile("-darwin", "^darwin-(386|amd64)$") // 1: amd64 (in Go 1.14: 386, amd64)
15551555
addMiscCompile("-mips", "^linux-mips") // 4: mips, mipsle, mips64, mips64le
15561556
addMiscCompile("-ppc", "^(linux-ppc64|aix-)") // 3: linux-ppc64{,le}, aix-ppc64
15571557
addMiscCompile("-solaris", "^(solaris|illumos)") // 2: both amd64
@@ -1560,29 +1560,12 @@ func init() {
15601560
addMiscCompile("-netbsd", "^netbsd-") // 4: amd64, 386, arm, arm64
15611561
addMiscCompile("-openbsd", "^openbsd-") // 4: amd64, 386, arm, arm64
15621562

1563-
// TODO(golang.org/issue/41610): Test misc-compile-ios as a post-
1564-
// submit builder with a known issue, before promoting to trybot.
1565-
func(suffix, rx string) {
1566-
addBuilder(BuildConfig{
1567-
Name: "misc-compile" + suffix,
1568-
HostType: "host-linux-jessie",
1569-
buildsRepo: func(repo, branch, goBranch string) bool { return repo == "go" && branch == "master" },
1570-
KnownIssue: 41610,
1571-
env: []string{"GO_DISABLE_OUTBOUND_NETWORK=1"},
1572-
CompileOnly: true,
1573-
Notes: "Runs buildall.sh to cross-compile & vet std+cmd packages for " + rx + ", but doesn't run any tests.",
1574-
allScriptArgs: []string{
1575-
// Filtering pattern to buildall.bash:
1576-
rx,
1577-
},
1578-
})
1579-
}("-ios", "^ios-") // 1: arm64 (for Go 1.16 and newer)
1580-
15811563
// And 3 that don't fit above:
15821564
addMiscCompile("-other", "^(linux-s390x|linux-riscv64|dragonfly-amd64)$")
1583-
// TODO: Issue 25963, get the misc-compile trybots for
1584-
// subrepos too, so "mobile" can at least be included as a
1585-
// misc-compile for ^android- and ^darwin-arm.
1565+
1566+
// TODO: Issue 25963, get the misc-compile trybots for Android/iOS.
1567+
// Then consider subrepos too, so "mobile" can at least be included
1568+
// as a misc-compile for ^android- and ^ios-.
15861569

15871570
addBuilder(BuildConfig{
15881571
Name: "linux-amd64-nocgo",

dashboard/builders_test.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -787,16 +787,18 @@ func TestTryBotsCompileAllPorts(t *testing.T) {
787787
ports := strings.Fields(string(out))
788788

789789
done := map[string]bool{}
790-
done["nacl-386"] = true // removed in Go 1.14
791-
done["nacl-arm"] = true // removed in Go 1.14
792-
done["windows-arm"] = true // TODO(golang.org/issue/38607) disabled until builder is replaced
790+
done["darwin-arm"] = true // TODO: Remove when Go 1.16 is out and Go 1.14 becomes unsupported.
791+
done["windows-arm"] = true // TODO(golang.org/issue/38607) disabled until builder is replaced
792+
done["darwin-arm64"] = true // TODO(golang.org/issue/39782): Add builder for darwin/arm64.
793793
check := func(goos, goarch string) {
794-
if goos == "android" {
794+
if goos == "android" || goos == "ios" {
795795
// TODO(golang.org/issue/25963): support
796-
// compilation-only Android trybots.
796+
// compilation-only Android and iOS trybots.
797797
// buildall.bash doesn't set the environment
798798
// up enough for e.g. compiling android-386
799799
// from linux-amd64. (Issue #35596 too)
800+
// iOS likely needs to be built on macOS
801+
// with Xcode available.
800802
return
801803
}
802804
goosArch := goos + "-" + goarch

0 commit comments

Comments
 (0)