Skip to content

Commit fcf24c2

Browse files
authored
chore: update to bazel 4.1.0 (bazel-contrib#2792)
1 parent 4c9c986 commit fcf24c2

File tree

8 files changed

+21
-13
lines changed

8 files changed

+21
-13
lines changed

.bazelci/presubmit.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
bazel: 4.0.0
2+
bazel: 4.1.0
33
# Note, this will tell the user to do the wrong thing (manually run buildifer)
44
# See https://github.com/bazelbuild/continuous-integration/issues/1161
55
buildifier:

.bazelrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ build --experimental_inprocess_symlink_creation
2626
###############################
2727

2828
# Load default settings for Remote Build Execution.
29-
import %workspace%/third_party/github.com/bazelbuild/bazel-toolchains/bazelrc/bazel-0.28.0.bazelrc
29+
import %workspace%/third_party/github.com/bazelbuild/bazel-toolchains/bazelrc/bazel-4.1.0.bazelrc
3030

3131
# Remote instance, borrow the one used by Angular devs
3232
build:remote --remote_instance_name=projects/internal-200822/instances/default_instance

.bazelversion

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.0.0
1+
4.1.0

common.bazelrc

+3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
# Cache action outputs on disk so they persist across output_base and bazel shutdown (eg. changing branches)
88
build --disk_cache=~/.cache/bazel-disk-cache
99

10+
# Bazel picks up host-OS-specific config lines from bazelrc files
11+
build --enable_platform_specific_config
12+
1013
# Bazel will create symlinks from the workspace directory to output artifacts.
1114
# Build results will be placed in a directory called "dist/bin"
1215
# Other directories will be created like "dist/testlogs"

index.bzl

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def yarn_install(**kwargs):
8686
# against.
8787
# This version should be updated together with the version of the Bazel
8888
# in .bazelversion. This is asserted in //internal:bazel_version_test.
89-
BAZEL_VERSION = "4.0.0"
89+
BAZEL_VERSION = "4.1.0"
9090

9191
# Versions of Bazel which users should be able to use.
9292
# Ensures we don't break backwards-compatibility,

package.bzl

+4-4
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,11 @@ def rules_nodejs_dev_dependencies():
7979
_maybe(
8080
http_archive,
8181
name = "bazel_toolchains",
82-
sha256 = "1adf5db506a7e3c465a26988514cfc3971af6d5b3c2218925cd6e71ee443fc3f",
83-
strip_prefix = "bazel-toolchains-4.0.0",
82+
sha256 = "179ec02f809e86abf56356d8898c8bd74069f1bd7c56044050c2cd3d79d0e024",
83+
strip_prefix = "bazel-toolchains-4.1.0",
8484
urls = [
85-
"https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/4.0.0/bazel-toolchains-4.0.0.tar.gz",
86-
"https://github.com/bazelbuild/bazel-toolchains/releases/download/4.0.0/bazel-toolchains-4.0.0.tar.gz",
85+
"https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/4.1.0/bazel-toolchains-4.1.0.tar.gz",
86+
"https://github.com/bazelbuild/bazel-toolchains/releases/download/4.1.0/bazel-toolchains-4.1.0.tar.gz",
8787
],
8888
)
8989

packages/typescript/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ package(default_visibility = ["//visibility:public"])
2424
bzl_library(
2525
name = "bzl",
2626
srcs = glob(["*.bzl"]) + [
27-
# Work-around since we don't have and don't wnat a bzl_library in the generated
27+
# Work-around since we don't have and don't want a bzl_library in the generated
2828
# @nodejs//:BUILD.bazel file
2929
"@nodejs//:index.bzl",
3030
],

third_party/github.com/bazelbuild/bazel-toolchains/bazelrc/bazel-0.28.0.bazelrc third_party/github.com/bazelbuild/bazel-toolchains/bazelrc/bazel-4.1.0.bazelrc

+9-4
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ build:remote --jobs=50
2727
# properties.
2828
# These flags should only be used as is for the rbe-ubuntu16-04 container
2929
# and need to be adapted to work with other toolchain containers.
30-
build:remote --host_javabase=@rbe_default//java:jdk
31-
build:remote --javabase=@rbe_default//java:jdk
32-
build:remote --host_java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8
33-
build:remote --java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8
30+
build:remote --java_runtime_version=rbe_jdk
31+
build:remote --tool_java_runtime_version=rbe_jdk
32+
build:remote --extra_toolchains=@rbe_default//java:all
33+
3434
build:remote --crosstool_top=@rbe_default//cc:toolchain
3535
build:remote --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
3636
# Platform flags:
@@ -49,6 +49,11 @@ build:remote --define=EXECUTOR=remote
4949
# Enable remote execution so actions are performed on the remote systems.
5050
build:remote --remote_executor=grpcs://remotebuildexecution.googleapis.com
5151

52+
# Enforce stricter environment rules, which eliminates some non-hermetic
53+
# behavior and therefore improves both the remote cache hit rate and the
54+
# correctness and repeatability of the build.
55+
build:remote --incompatible_strict_action_env=true
56+
5257
# Set a higher timeout value, just in case.
5358
build:remote --remote_timeout=3600
5459

0 commit comments

Comments
 (0)