From eb4c05d97ae5e67969bf805f97381b4c4e3aee48 Mon Sep 17 00:00:00 2001 From: Joey Perrott Date: Tue, 20 Oct 2020 14:47:13 -0700 Subject: [PATCH] build: update bazelversion (#39351) Updates to the latest version of bazel PR Close #39351 --- .bazelversion | 2 +- WORKSPACE | 4 ++-- packages/bazel/package.bzl | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.bazelversion b/.bazelversion index db4430e19a..a57c344a29 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1,3 +1,3 @@ -3.5.1 +3.6.0 # [NB: this comment has to be after the first line, see https://github.com/bazelbuild/bazelisk/issues/117] # When updating the Bazel version you also need to update the RBE toolchains version in package.bzl diff --git a/WORKSPACE b/WORKSPACE index 7c001ff1b2..7054692cfb 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -81,14 +81,14 @@ rbe_autoconfig( # Need to specify a base container digest in order to ensure that we can use the checked-in # platform configurations for the "ubuntu16_04" image. Otherwise the autoconfig rule would # need to pull the image and run it in order determine the toolchain configuration. See: - # https://github.com/bazelbuild/bazel-toolchains/blob/3.5.1/configs/ubuntu16_04_clang/versions.bzl + # https://github.com/bazelbuild/bazel-toolchains/blob/3.6.0/configs/ubuntu16_04_clang/versions.bzl base_container_digest = "sha256:f6568d8168b14aafd1b707019927a63c2d37113a03bcee188218f99bd0327ea1", # Note that if you change the `digest`, you might also need to update the # `base_container_digest` to make sure marketplace.gcr.io/google/rbe-ubuntu16-04-webtest: # and marketplace.gcr.io/google/rbe-ubuntu16-04: have # the same Clang and JDK installed. Clang is needed because of the dependency on # @com_google_protobuf. Java is needed for the Bazel's test executor Java tool. - digest = "sha256:f743114235a43355bf8324e2ba0fa6a597236fe06f7bc99aaa9ac703631c306b", + digest = "sha256:dddaaddbe07a61c2517f9b08c4977fc23c4968fcb6c0b8b5971e955d2de7a961", env = clang_env(), registry = "marketplace.gcr.io", # We can't use the default "ubuntu16_04" RBE image provided by the autoconfig because we need diff --git a/packages/bazel/package.bzl b/packages/bazel/package.bzl index 885e3af4a6..4ebf61a888 100644 --- a/packages/bazel/package.bzl +++ b/packages/bazel/package.bzl @@ -29,11 +29,11 @@ def rules_angular_dev_dependencies(): _maybe( http_archive, name = "bazel_toolchains", - sha256 = "698d52e561cc8b5f502dc1ce83b6db72d5dabed4ae756393fb326b0243e4e20c", - strip_prefix = "bazel-toolchains-3.5.1", + sha256 = "4fb3ceea08101ec41208e3df9e56ec72b69f3d11c56629d6477c0ff88d711cf7", + strip_prefix = "bazel-toolchains-3.6.0", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/3.5.1/bazel-toolchains-3.5.1.tar.gz", - "https://github.com/bazelbuild/bazel-toolchains/releases/download/3.5.1/bazel-toolchains-3.5.1.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/3.6.0/bazel-toolchains-3.6.0.tar.gz", + "https://github.com/bazelbuild/bazel-toolchains/releases/download/3.6.0/bazel-toolchains-3.6.0.tar.gz", ], )