diff options
| author | Konstantin Bogomolov <bogomolov@google.com> | 2025-08-27 02:48:12 +0000 |
|---|---|---|
| committer | Aleksandr Nogikh <nogikh@google.com> | 2025-08-28 08:39:12 +0000 |
| commit | bee60a83ac500de0590dfe108da76395d821092a (patch) | |
| tree | 64712dc2710ff3e7f55b4e833e15f5a60e4a1cb4 /pkg | |
| parent | 1e8c3924f7d57db9cb37b9bd8c0e139b021bedf1 (diff) | |
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.
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/build/build.go | 5 |
1 files changed, 4 insertions, 1 deletions
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 |