diff --git a/cmd/coordinator/coordinator.go b/cmd/coordinator/coordinator.go index ed9239fc..fe8fd56f 100644 --- a/cmd/coordinator/coordinator.go +++ b/cmd/coordinator/coordinator.go @@ -1053,6 +1053,7 @@ func (st *buildStatus) build() (retErr error) { OnStartExec: func() { st.logEventTime("running_exec") }, ExtraEnv: st.conf.Env(), Debug: true, + Args: st.conf.AllScriptArgs(), }) if err != nil { return err diff --git a/dashboard/builders.go b/dashboard/builders.go index e44acee7..348e196e 100644 --- a/dashboard/builders.go +++ b/dashboard/builders.go @@ -70,9 +70,21 @@ func (c *BuildConfig) AllScript() string { if strings.HasPrefix(c.Name, "nacl-") { return "src/nacltest.bash" } + if strings.HasPrefix(c.Name, "darwin-arm") { + return "src/iostest.bash" + } return "src/all.bash" } +// AllScript returns the set of arguments that should be passed to the +// all.bash-equivalent script. Usually empty. +func (c *BuildConfig) AllScriptArgs() []string { + if strings.HasPrefix(c.Name, "darwin-arm") { + return []string{"-restart"} + } + return nil +} + // MakeScript returns the relative path to the operating system's script to // do the build. // Example values are "src/make.bash", "src/make.bat", "src/make.rc". @@ -296,6 +308,20 @@ func init() { Go14URL: "https://storage.googleapis.com/go-builder-data/go1.4-darwin-amd64.tar.gz", IsReverse: true, }) + addBuilder(BuildConfig{ + Name: "darwin-arm-iphone4s", + Go14URL: "https://storage.googleapis.com/go-builder-data/go1.4-darwin-amd64.tar.gz", + IsReverse: true, + env: []string{"GOARCH=arm", "GOHOSTARCH=amd64"}, + }) + // iOS builder. Runs on an OS X host. It cross compiling binaries + // for darwin/arm64 and runs them on an attached iPad Mini 3. + addBuilder(BuildConfig{ + Name: "darwin-arm64-ipadmini3", + Go14URL: "https://storage.googleapis.com/go-builder-data/go1.4-darwin-amd64.tar.gz", + IsReverse: true, + env: []string{"GOARCH=arm64", "GOHOSTARCH=amd64"}, + }) } func addBuilder(c BuildConfig) {