diff --git a/dashboard/app/build/ui.go b/dashboard/app/build/ui.go index d2d805e8..0536dc0b 100644 --- a/dashboard/app/build/ui.go +++ b/dashboard/app/build/ui.go @@ -175,6 +175,14 @@ func isRace(s string) bool { return strings.Contains(s, "-race-") || strings.HasSuffix(s, "-race") } +func unsupportedOS(os string) bool { + if os == "race" { + return false + } + p, ok := osPriority[os] + return !ok || p > 0 +} + // Priorities for specific operating systems. var osPriority = map[string]int{ "darwin": 0, @@ -239,15 +247,17 @@ var uiTemplate = template.Must( ) var tmplFuncs = template.FuncMap{ + "buildDashboards": buildDashboards, + "builderOS": builderOS, + "builderSpans": builderSpans, "builderSubheading": builderSubheading, "builderTitle": builderTitle, - "builderSpans": builderSpans, - "buildDashboards": buildDashboards, "repoURL": repoURL, "shortDesc": shortDesc, "shortHash": shortHash, "shortUser": shortUser, "tail": tail, + "unsupportedOS": unsupportedOS, } func splitDash(s string) (string, string) { diff --git a/dashboard/app/build/ui.html b/dashboard/app/build/ui.html index 69b56d93..04184732 100644 --- a/dashboard/app/build/ui.html +++ b/dashboard/app/build/ui.html @@ -56,7 +56,7 @@ .dashboards, .paginate { padding: 0.5em; } - .dashboards a, .paginate a { + .dashboards > a, .paginate a { padding: 0.5em; background: #eee; color: blue; @@ -68,6 +68,19 @@ color: #C00; } + +

{{$.Dashboard.Name}} Build Status

@@ -75,6 +88,10 @@ {{range buildDashboards}} {{.Name}} {{end}} + {{with $.Package.Name}}

{{.}}

{{end}} @@ -83,7 +100,7 @@ {{range $.Builders | builderSpans}} - + {{end}} @@ -98,7 +115,7 @@ {{end}} {{range $.Builders | builderSpans}} - + {{end}} @@ -112,8 +129,11 @@ {{end}} {{range $.Builders}} - + {{end}} + + + {{range $c := $.Commits}} {{range $i, $h := $c.ResultGoHashes}} @@ -127,7 +147,7 @@ {{end}} {{range $.Builders}} - {{range $.Builders | builderSpans}} - + {{end}} @@ -189,7 +209,7 @@ {{range $.Builders | builderSpans}} - + {{end}} @@ -199,7 +219,7 @@ {{range $.Builders}} - + {{end}} @@ -213,7 +233,7 @@ {{shortHash $h}} {{range $.Builders}} -
 {{.OS}}{{.OS}}  {{builderSubheading .}}{{builderSubheading .}}
{{shortHash $h}} + {{with $c.Result . $h}} {{if .OK}} ok @@ -177,7 +197,7 @@
{{.OS}}{{.OS}} {{builderSubheading .}}{{builderSubheading .}} + {{with $pkg.Commit.Result . $goHash}} {{if .OK}} ok