From a979ae33433381a0f99fe48b86ea9b3b2d0c0c6b Mon Sep 17 00:00:00 2001 From: Dmitri Shuralyov Date: Mon, 30 Jan 2023 11:40:05 -0500 Subject: [PATCH] dashboard: re-enable js/wasm TryBot (with Node 18) After all.bash is passing with Node.js 18, the js/wasm builder can be enabled as a regular TryBot again (this time with Node 18 in place of Node 14). For golang/go#57614. Change-Id: I714380fba89e37275aed4144a1e8b50e0cc57884 Reviewed-on: https://go-review.googlesource.com/c/build/+/464036 Auto-Submit: Dmitri Shuralyov TryBot-Result: Gopher Robot Reviewed-by: Dmitri Shuralyov Run-TryBot: Dmitri Shuralyov Reviewed-by: Michael Knyszek Reviewed-by: Carlos Amedee --- dashboard/builders.go | 8 +++----- dashboard/builders_test.go | 8 ++++---- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dashboard/builders.go b/dashboard/builders.go index eaae3581..c3e8936d 100644 --- a/dashboard/builders.go +++ b/dashboard/builders.go @@ -1583,7 +1583,6 @@ func init() { addMiscCompile("-other-1", "dragonfly-amd64", "linux-loong64") addMiscCompile("-other-2", "linux-riscv64", "linux-s390x", "linux-arm-arm5") // 'linux-arm-arm5' is linux/arm with GOARM=5. addMiscCompileGo1(20, "-go1.20", "freebsd-riscv64") - addMiscCompileGo1(21, "-go1.21", "js-wasm") // TODO(go.dev/issue/57614): Use a misc-compile trybot for js/wasm until Node 18 builder can work as a trybot. // TODO: Issue 25963, get the misc-compile trybots for Android/iOS. // Then consider subrepos too, so "mobile" can at least be included @@ -1904,10 +1903,9 @@ func init() { }, }) addBuilder(BuildConfig{ - Name: "js-wasm-node18", - HostType: "host-linux-amd64-js-wasm-node18", - KnownIssues: []int{57614}, // After this known issue is resolved, re-enable it as a TryBot below: - //tryBot: explicitTrySet("go"), + Name: "js-wasm-node18", + HostType: "host-linux-amd64-js-wasm-node18", + tryBot: explicitTrySet("go"), buildsRepo: func(repo, branch, goBranch string) bool { b := buildRepoByDefault(repo) && atLeastGo1(goBranch, 21) switch repo { diff --git a/dashboard/builders_test.go b/dashboard/builders_test.go index 3f48c882..9d10cd52 100644 --- a/dashboard/builders_test.go +++ b/dashboard/builders_test.go @@ -94,6 +94,7 @@ func TestTrybots(t *testing.T) { branch: "master", want: []string{ "freebsd-amd64-12_3", + "js-wasm-node18", "linux-386", "linux-amd64", "linux-amd64-boringcrypto", @@ -119,7 +120,6 @@ func TestTrybots(t *testing.T) { "misc-compile-other-1", "misc-compile-other-2", "misc-compile-go1.20", - "misc-compile-go1.21", }, }, { @@ -127,6 +127,7 @@ func TestTrybots(t *testing.T) { branch: "release-branch.go1.21", want: []string{ "freebsd-amd64-12_3", + "js-wasm-node18", "linux-386", "linux-amd64", "linux-amd64-boringcrypto", @@ -152,7 +153,6 @@ func TestTrybots(t *testing.T) { "misc-compile-other-1", "misc-compile-other-2", "misc-compile-go1.20", - "misc-compile-go1.21", // Include longtest builders on Go repo release branches. See issue 37827. "linux-386-longtest", @@ -501,8 +501,8 @@ func TestBuilderConfig(t *testing.T) { {b("android-amd64-emu", "go"), onlyPost}, {b("android-386-emu", "go"), onlyPost}, - {b("js-wasm-node18", "go"), onlyPost}, - {b("js-wasm-node18@go1.21", "go"), onlyPost}, + {b("js-wasm-node18", "go"), both}, + {b("js-wasm-node18@go1.21", "go"), both}, {b("js-wasm-node18@go1.20", "go"), none}, // Keep using js-wasm builder (with Node 14) only for Go 1.20 and older: {b("js-wasm", "go"), none},