From 26dcac1649d7b77188d792297a1c27731629c371 Mon Sep 17 00:00:00 2001 From: Felix Hanau Date: Tue, 22 Oct 2024 19:18:40 -0400 Subject: [PATCH] [build] Roll bazel 7.3.1:7.4.1 - Enable BwoB on Windows again now that https://github.com/bazelbuild/bazel/issues/23462 has been fixed. --- .bazelrc | 7 ++----- .bazelversion | 2 +- .github/workflows/test.yml | 3 --- build/ci.bazelrc | 2 -- 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/.bazelrc b/.bazelrc index 5ed9ec726cd2..77cde35c2880 100644 --- a/.bazelrc +++ b/.bazelrc @@ -14,14 +14,11 @@ common --noenable_bzlmod # bazel7 enables Build without the Bytes (BwoB) by default. This significantly speeds up builds # using the remote cache since less data needs to be fetched. Set remote_cache_eviction_retries -# just in case there are cache evictions during the build. -build --experimental_remote_cache_eviction_retries=3 +# which is required to fully support a "dumb" cache. Bazel 8 already sets this value by default. +build --experimental_remote_cache_eviction_retries=5 # Note that we use remote_download_minimal for test builds, which avoids fetching build outputs # where possible. While several previous BwoB bugs have been fixed, this is slower than it could be # due to https://github.com/bazelbuild/bazel/issues/20576. -# Windows build is failing on some runs due to FileAccessException errors, Bazel has had several -# similar bugs in the past. Disable BwoB for now. -build:windows --remote_download_all # Import CI-specific configuration. As the amount of custom configuration settings we use grows, # consider moving more flags out to separate files. diff --git a/.bazelversion b/.bazelversion index 643916c03f1f..cac684391584 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -7.3.1 +7.4.1rc2 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2066699d6e1f..ef7b449d6e1b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -43,9 +43,6 @@ jobs: - os: { name: linux, image: ubuntu-20.04 } config: { suffix: -asan } # Windows has a custom non-debug bazel config. - # As of 7.2.1 support for Bazel remote cache BwoB is broken on Windows, likely due to - # disk I/O race conditions causing permission denied errors (this also happened in - # previous versions). Use remote_download_all for now. - os: { name : windows, image : windows-2022 } config: { suffix: '' } # TODO (later): The custom Windows-debug configuration consistently runs out of disk diff --git a/build/ci.bazelrc b/build/ci.bazelrc index 74f5fbac8666..7a8661a77642 100644 --- a/build/ci.bazelrc +++ b/build/ci.bazelrc @@ -71,7 +71,5 @@ build:ci-macOS --copt=-UDEBUG build:ci-macOS-debug --config=debug -build:ci-windows-common --remote_download_all - build:ci-windows --config=windows_no_dbg --config=ci-windows-common build:ci-windows-debug --config=debug --config=ci-windows-common