chore: update to bazel 4.1.0 (bazel-contrib#2792)

twheys · Jan 13, 2022 · c0d1679 · c0d1679
1 parent ead1bde
commit c0d1679
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 13 deletions.
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
@@ -1,5 +1,5 @@
 ---
-bazel: 4.0.0
+bazel: 4.1.0
 # Note, this will tell the user to do the wrong thing (manually run buildifer)
 # See https://github.com/bazelbuild/continuous-integration/issues/1161
 buildifier:

diff --git a/.bazelrc b/.bazelrc
@@ -25,7 +25,7 @@ build --action_env=SOME_OTHER_ENV=some_other_value
 ###############################
 
 # Load default settings for Remote Build Execution.
-import %workspace%/third_party/github.com/bazelbuild/bazel-toolchains/bazelrc/bazel-0.28.0.bazelrc
+import %workspace%/third_party/github.com/bazelbuild/bazel-toolchains/bazelrc/bazel-4.1.0.bazelrc
 
 # Remote instance, borrow the one used by Angular devs
 build:remote --remote_instance_name=projects/internal-200822/instances/default_instance

diff --git a/.bazelversion b/.bazelversion
@@ -1 +1 @@
-4.0.0
+4.1.0
diff --git a/common.bazelrc b/common.bazelrc
@@ -7,6 +7,9 @@
 # Cache action outputs on disk so they persist across output_base and bazel shutdown (eg. changing branches)
 build --disk_cache=~/.cache/bazel-disk-cache
 
+# Bazel picks up host-OS-specific config lines from bazelrc files
+build --enable_platform_specific_config
+
 # Bazel will create symlinks from the workspace directory to output artifacts.
 # Build results will be placed in a directory called "dist/bin"
 # Other directories will be created like "dist/testlogs"

diff --git a/index.bzl b/index.bzl
@@ -86,7 +86,7 @@ def yarn_install(**kwargs):
 # against.
 # This version should be updated together with the version of the Bazel
 # in .bazelversion. This is asserted in //internal:bazel_version_test.
-BAZEL_VERSION = "4.0.0"
+BAZEL_VERSION = "4.1.0"
 
 # Versions of Bazel which users should be able to use.
 # Ensures we don't break backwards-compatibility,

diff --git a/package.bzl b/package.bzl
@@ -79,11 +79,11 @@ def rules_nodejs_dev_dependencies():
     _maybe(
         http_archive,
         name = "bazel_toolchains",
-        sha256 = "1adf5db506a7e3c465a26988514cfc3971af6d5b3c2218925cd6e71ee443fc3f",
-        strip_prefix = "bazel-toolchains-4.0.0",
+        sha256 = "179ec02f809e86abf56356d8898c8bd74069f1bd7c56044050c2cd3d79d0e024",
+        strip_prefix = "bazel-toolchains-4.1.0",
         urls = [
-            "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/4.0.0/bazel-toolchains-4.0.0.tar.gz",
-            "https://github.com/bazelbuild/bazel-toolchains/releases/download/4.0.0/bazel-toolchains-4.0.0.tar.gz",
+            "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/4.1.0/bazel-toolchains-4.1.0.tar.gz",
+            "https://github.com/bazelbuild/bazel-toolchains/releases/download/4.1.0/bazel-toolchains-4.1.0.tar.gz",
         ],
     )
 

diff --git a/packages/typescript/BUILD.bazel b/packages/typescript/BUILD.bazel
@@ -24,7 +24,7 @@ package(default_visibility = ["//visibility:public"])
 bzl_library(
     name = "bzl",
     srcs = glob(["*.bzl"]) + [
-        # Work-around since we don't have and don't wnat a bzl_library in the generated
+        # Work-around since we don't have and don't want a bzl_library in the generated
         # @nodejs//:BUILD.bazel file
         "@nodejs//:index.bzl",
     ],

diff --git a/...l-toolchains/bazelrc/bazel-0.28.0.bazelrc → ...el-toolchains/bazelrc/bazel-4.1.0.bazelrc b/...l-toolchains/bazelrc/bazel-0.28.0.bazelrc → ...el-toolchains/bazelrc/bazel-4.1.0.bazelrc
@@ -27,10 +27,10 @@ build:remote --jobs=50
 # properties.
 # These flags should only be used as is for the rbe-ubuntu16-04 container
 # and need to be adapted to work with other toolchain containers.
-build:remote --host_javabase=@rbe_default//java:jdk
-build:remote --javabase=@rbe_default//java:jdk
-build:remote --host_java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8
-build:remote --java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8
+build:remote --java_runtime_version=rbe_jdk
+build:remote --tool_java_runtime_version=rbe_jdk
+build:remote --extra_toolchains=@rbe_default//java:all
+
 build:remote --crosstool_top=@rbe_default//cc:toolchain
 build:remote --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
 # Platform flags:
@@ -49,6 +49,11 @@ build:remote --define=EXECUTOR=remote
 # Enable remote execution so actions are performed on the remote systems.
 build:remote --remote_executor=grpcs://remotebuildexecution.googleapis.com
 
+# Enforce stricter environment rules, which eliminates some non-hermetic
+# behavior and therefore improves both the remote cache hit rate and the
+# correctness and repeatability of the build.
+build:remote --incompatible_strict_action_env=true
+
 # Set a higher timeout value, just in case.
 build:remote --remote_timeout=3600