Skip to content

Commit 594b4ef

Browse files
authored
build: update to bazel 3.6 (#20855)
Bumps the version of Bazel to 3.6 like in angular/angular in an attempt to resolve some of the recent CI flakes.
1 parent 79b932d commit 594b4ef

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

.bazelrc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ build:remote --host_cpu=k8
8181
# Setup the remote build execution servers.
8282
build:remote --remote_cache=remotebuildexecution.googleapis.com
8383
build:remote --remote_executor=remotebuildexecution.googleapis.com
84-
build:remote --tls_enabled=true
8584
build:remote --auth_enabled=true
8685

8786
# Setup the toolchain and platform for the remote build execution. The platform

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.1.0
1+
3.6.0

WORKSPACE

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ sass_repositories()
9797
# Bring in bazel_toolchains for RBE setup configuration.
9898
http_archive(
9999
name = "bazel_toolchains",
100-
sha256 = "144290c4166bd67e76a54f96cd504ed86416ca3ca82030282760f0823c10be48",
101-
strip_prefix = "bazel-toolchains-3.1.1",
102-
url = "https://github.com/bazelbuild/bazel-toolchains/archive/3.1.1.tar.gz",
100+
sha256 = "4fb3ceea08101ec41208e3df9e56ec72b69f3d11c56629d6477c0ff88d711cf7",
101+
strip_prefix = "bazel-toolchains-3.6.0",
102+
url = "https://github.com/bazelbuild/bazel-toolchains/archive/3.6.0.tar.gz",
103103
)
104104

105105
load("@bazel_toolchains//repositories:repositories.bzl", bazel_toolchains_repositories = "repositories")
@@ -114,8 +114,8 @@ rbe_autoconfig(
114114
# platform configurations for the "ubuntu16_04" image. Otherwise the autoconfig rule would
115115
# need to pull the image and run it in order determine the toolchain configuration.
116116
# See: https://github.com/bazelbuild/bazel-toolchains/blob/master/configs/ubuntu16_04_clang/versions.bzl#L9
117-
base_container_digest = "sha256:b516a2d69537cb40a7c6a7d92d0008abb29fba8725243772bdaf2c83f1be2272",
118-
digest = "sha256:0b8fa87db4b8e5366717a7164342a029d1348d2feea7ecc4b18c780bc2507059",
117+
base_container_digest = "sha256:f6568d8168b14aafd1b707019927a63c2d37113a03bcee188218f99bd0327ea1",
118+
digest = "sha256:dddaaddbe07a61c2517f9b08c4977fc23c4968fcb6c0b8b5971e955d2de7a961",
119119
registry = "marketplace.gcr.io",
120120
# We can't use the default "ubuntu16_04" RBE image provided by the autoconfig because we need
121121
# a specific Linux kernel that comes with "libx11" in order to run headless browser tests.

0 commit comments

Comments
 (0)