From bee60a83ac500de0590dfe108da76395d821092a Mon Sep 17 00:00:00 2001 From: Konstantin Bogomolov Date: Wed, 27 Aug 2025 02:48:12 +0000 Subject: tools/docker: install bazelisk instead of bazel The needed Bazel version to build gVisor got bumped. However, instead of doing the same bump in two places whenever this happens, we can simply use bazelisk in syzkaller to determine which bazel version to use automatically. --- pkg/build/build.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'pkg') diff --git a/pkg/build/build.go b/pkg/build/build.go index 26ba8f4d3..a9d23cbe0 100644 --- a/pkg/build/build.go +++ b/pkg/build/build.go @@ -192,7 +192,7 @@ func compilerIdentity(compiler string) (string, error) { arg, timeout := "--version", time.Minute if bazel { // Bazel episodically fails with 1 min timeout. - arg, timeout = "", 10*time.Minute + timeout = 10 * time.Minute } output, err := osutil.RunCmd(timeout, "", compiler, arg) if err != nil { @@ -210,6 +210,9 @@ func compilerIdentity(compiler string) (string, error) { if strings.HasPrefix(line, "WARNING: ") { continue } + if strings.Contains(line, "Downloading https://releases.bazel") { + continue + } } return strings.TrimSpace(line), nil -- cgit mrf-deployment