From 5d7d900894cb1db2755cfc2fea7943fe386eacfb Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Fri, 29 Jul 2022 12:16:23 -0400 Subject: [PATCH] dashboard: reenable linux-amd64-alpine It passes all.bash in the main repo after CL 419995. For golang/go#19938. Change-Id: I03c32193bbc83667e7bbbb2251e15a4a9bef6cfc Reviewed-on: https://go-review.googlesource.com/c/build/+/420214 Reviewed-by: Dmitri Shuralyov Run-TryBot: Russ Cox Reviewed-by: Carlos Amedee TryBot-Result: Gopher Robot --- dashboard/builders.go | 12 ++++-------- dashboard/builders_test.go | 4 +--- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/dashboard/builders.go b/dashboard/builders.go index 3bf4b30c87..678ea46df1 100644 --- a/dashboard/builders.go +++ b/dashboard/builders.go @@ -1591,14 +1591,10 @@ func init() { HostType: "host-linux-amd64-stretch-vmx", buildsRepo: disabledBuilder, }) - - const testAlpine = false // Issue 22689 (hide all red builders), Issue 19938 (get Alpine passing) - if testAlpine { - addBuilder(BuildConfig{ - Name: "linux-amd64-alpine", - HostType: "host-linux-amd64-alpine", - }) - } + addBuilder(BuildConfig{ + Name: "linux-amd64-alpine", + HostType: "host-linux-amd64-alpine", + }) // addMiscCompileGo1 adds a misc-compile TryBot that // runs buildall.bash on the specified target(s), up to 3 max. diff --git a/dashboard/builders_test.go b/dashboard/builders_test.go index 7e7f1a5e48..70d385df70 100644 --- a/dashboard/builders_test.go +++ b/dashboard/builders_test.go @@ -669,9 +669,7 @@ func TestBuilderConfig(t *testing.T) { } func TestHostConfigsAllUsed(t *testing.T) { - knownUnused := map[string]bool{ - "host-linux-amd64-alpine": true, // TODO(golang.org/issue/19938): Fix the Alpine builder, or remove it. - } + knownUnused := map[string]bool{} used := make(map[string]bool) for _, conf := range Builders {