Skip to content

Commit

Permalink
dashboard: require at least Go 1.12 for aix builder
Browse files Browse the repository at this point in the history
Fixes golang/go#30799

Change-Id: I0b3b53b715e2dc00f10548f74443224190003818
Reviewed-on: https://go-review.googlesource.com/c/build/+/167357
Reviewed-by: Bryan C. Mills <bcmills@google.com>
  • Loading branch information
tklauser authored and bradfitz committed Mar 13, 2019
1 parent 60407a3 commit b7b6693
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 7 deletions.
20 changes: 13 additions & 7 deletions dashboard/builders.go
Original file line number Diff line number Diff line change
Expand Up @@ -965,11 +965,16 @@ func (c *BuildConfig) buildsRepoAtAll(repo, branch, goBranch string) bool {
}
// Don't build old branches.
const minGo1x = 11
if strings.HasPrefix(goBranch, "release-branch.go1") && !atLeastGo1(goBranch, minGo1x) {
return false
}
if strings.HasPrefix(branch, "release-branch.go1") && !atLeastGo1(branch, minGo1x) {
return false
for _, b := range []string{branch, goBranch} {
if bmaj, bmin, ok := version.ParseReleaseBranch(b); ok {
if bmaj != 1 || bmin < minGo1x {
return false
}
bmm := types.MajorMinor{bmaj, bmin}
if bmm.Less(c.MinimumGoVersion) {
return false
}
}
}

// Build dev.boringcrypto branches only on linux/amd64 and windows/386 (see golang.org/issue/26791).
Expand Down Expand Up @@ -2053,8 +2058,9 @@ func init() {
SkipSnapshot: true,
})
addBuilder(BuildConfig{
Name: "aix-ppc64",
HostType: "host-aix-ppc64-osuosl",
Name: "aix-ppc64",
HostType: "host-aix-ppc64-osuosl",
MinimumGoVersion: types.MajorMinor{1, 12},
env: []string{
"PATH=/opt/freeware/bin:/usr/bin:/etc:/usr/sbin:/usr/ucb:/usr/bin/X11:/sbin:/usr/java7_64/jre/bin:/usr/java7_64/bin",
},
Expand Down
8 changes: 8 additions & 0 deletions dashboard/builders_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,14 @@ func TestBuilderConfig(t *testing.T) {
{b("freebsd-386-12_0", "go"), onlyPost},
{b("freebsd-386-12_0", "net"), onlyPost},

// AIX starts at Go 1.12
{b("aix-ppc64", "go"), onlyPost},
{b("aix-ppc64", "net"), onlyPost},
{b("aix-ppc64@go1.12", "go"), onlyPost},
{b("aix-ppc64@go1.12", "net"), onlyPost},
{b("aix-ppc64@go1.11", "go"), none},
{b("aix-ppc64@go1.11", "net"), none},

{b("linux-amd64-nocgo", "mobile"), none},

// The physical ARM Androids only runs "go":
Expand Down

0 comments on commit b7b6693

Please sign in to comment.