Skip to content

Commit 67175b2

Browse files
alan-agius4pull[bot]
authored andcommitted
build: update to bazel 3.4.0
1 parent ce2b5cd commit 67175b2

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

.bazelversion

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
2.1.1
1+
3.4.1
22
# [NB: this comment has to be after the first line, see https://github.com/bazelbuild/bazelisk/issues/117]
3-
# When updating the Bazel version you also need to update the RBE toolchains version in package.bzl
3+
# When updating the Bazel version you also need to update the RBE toolchains version in WORKSPACE

.circleci/bazel.rc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ test --test_tag_filters=-manual
1414
# Bazel doesn't calculate the memory ceiling correctly when running under Docker.
1515
# Limit Bazel to consuming resources that fit in CircleCI "medium" class which is the default:
1616
# https://circleci.com/docs/2.0/configuration-reference/#resource_class
17-
build --local_resources=3072,2.0,1.0
17+
build --local_ram_resources=3072
18+
build --local_cpu_resources=2
1819

1920
# More details on failures
2021
build --verbose_failures=true

WORKSPACE

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,17 +120,18 @@ rbe_autoconfig(
120120
# Need to specify a base container digest in order to ensure that we can use the checked-in
121121
# platform configurations for the "ubuntu16_04" image. Otherwise the autoconfig rule would
122122
# need to pull the image and run it in order determine the toolchain configuration. See:
123-
# https://github.com/bazelbuild/bazel-toolchains/blob/1.1.2/configs/ubuntu16_04_clang/versions.bzl
124-
base_container_digest = "sha256:1ab40405810effefa0b2f45824d6d608634ccddbf06366760c341ef6fbead011",
123+
# https://github.com/bazelbuild/bazel-toolchains/blob/3.4.1/configs/ubuntu16_04_clang/versions.bzl
124+
base_container_digest = "sha256:b27c9c4786d5bd1c709aa979b7432328806e0ff671e2175d696584eec4fd0ec3",
125125
# Note that if you change the `digest`, you might also need to update the
126126
# `base_container_digest` to make sure marketplace.gcr.io/google/rbe-ubuntu16-04-webtest:<digest>
127127
# and marketplace.gcr.io/google/rbe-ubuntu16-04:<base_container_digest> have
128128
# the same Clang and JDK installed. Clang is needed because of the dependency on
129129
# @com_google_protobuf. Java is needed for the Bazel's test executor Java tool.
130-
digest = "sha256:0b8fa87db4b8e5366717a7164342a029d1348d2feea7ecc4b18c780bc2507059",
130+
digest = "sha256:f743114235a43355bf8324e2ba0fa6a597236fe06f7bc99aaa9ac703631c306b",
131131
env = clang_env(),
132132
registry = "marketplace.gcr.io",
133133
# We can't use the default "ubuntu16_04" RBE image provided by the autoconfig because we need
134134
# a specific Linux kernel that comes with "libx11" in order to run headless browser tests.
135135
repository = "google/rbe-ubuntu16-04-webtest",
136+
use_checked_in_confs = "Force",
136137
)

0 commit comments

Comments
 (0)