diff --git a/app/build/ui.go b/app/build/ui.go index e02ae4a0..816d13fe 100644 --- a/app/build/ui.go +++ b/app/build/ui.go @@ -159,6 +159,10 @@ func (s builderOrder) Less(i, j int) bool { } func builderPriority(builder string) int { + // Put -temp builders at the end, always. + if strings.HasSuffix(builder, "-temp") { + return 20 + } // Group race builders together. if isRace(builder) { return 1 @@ -175,6 +179,13 @@ func isRace(s string) bool { return strings.Contains(s, "-race-") || strings.HasSuffix(s, "-race") } +func unsupported(builder string) bool { + if strings.HasSuffix(builder, "-temp") { + return true + } + return unsupportedOS(builderOS(builder)) +} + func unsupportedOS(os string) bool { if os == "race" { return false @@ -257,7 +268,7 @@ var tmplFuncs = template.FuncMap{ "shortHash": shortHash, "shortUser": shortUser, "tail": tail, - "unsupportedOS": unsupportedOS, + "unsupported": unsupported, } func splitDash(s string) (string, string) { @@ -318,8 +329,9 @@ func builderArchChar(s string) string { } type builderSpan struct { - N int - OS string + N int + OS string + Unsupported bool } // builderSpans creates a list of tags showing @@ -330,10 +342,11 @@ func builderSpans(s []string) []builderSpan { for len(s) > 0 { i := 1 os := builderOSOrRace(s[0]) + u := unsupportedOS(os) || strings.HasSuffix(s[0], "-temp") for i < len(s) && builderOSOrRace(s[i]) == os { i++ } - sp = append(sp, builderSpan{i, os}) + sp = append(sp, builderSpan{i, os, u}) s = s[i:] } return sp diff --git a/app/build/ui.html b/app/build/ui.html index 96fa6ea7..e4af7aff 100644 --- a/app/build/ui.html +++ b/app/build/ui.html @@ -47,7 +47,7 @@ {{range $.Builders | builderSpans}} - + {{end}} @@ -62,7 +62,7 @@ {{end}} {{range $.Builders | builderSpans}} - + {{end}} @@ -76,7 +76,7 @@ {{end}} {{range $.Builders}} - + {{end}} @@ -94,7 +94,7 @@ {{end}} {{range $.Builders}} - {{range $.Builders | builderSpans}} - + {{end}} @@ -158,7 +158,7 @@ {{range $.Builders | builderSpans}} - + {{end}} @@ -168,7 +168,7 @@ {{range $.Builders}} - + {{end}} @@ -182,7 +182,7 @@ {{shortHash $h}} {{range $.Builders}} -
 {{.OS}}{{.OS}}  {{builderSubheading .}}{{builderSubheading .}} {{shortHash $h}} + {{with $c.Result . $h}} {{if .OK}} ok @@ -146,7 +146,7 @@
{{.OS}}{{.OS}} {{builderSubheading .}}{{builderSubheading .}} + {{with $pkg.Commit.Result . $goHash}} {{if .OK}} ok