diff options
| author | Nicolas Lacasse <nlacasse@google.com> | 2020-04-10 14:02:48 -0700 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-04-10 14:04:07 -0700 |
| commit | 99056b6bd6bf7227f38c07a6f0214359d212bfc2 (patch) | |
| tree | 6cdd7a362134e570685468d6e29fe989eccb87fc | |
| parent | 82dfc406e21a75945da1a12f40eb876f519e04aa (diff) | |
Upgrade Kokoro and RBE to bazel 3.0.0
PiperOrigin-RevId: 305940483
| -rw-r--r-- | BUILD | 7 | ||||
| -rwxr-xr-x | tools/images/ubuntu1604/20_bazel.sh | 5 |
2 files changed, 9 insertions, 3 deletions
@@ -97,7 +97,7 @@ platform( remote_execution_properties = """ properties: { name: "container-image" - value:"docker://gcr.io/cloud-marketplace/google/rbe-ubuntu16-04@sha256:93f7e127196b9b653d39830c50f8b05d49ef6fd8739a9b5b8ab16e1df5399e50" + value:"docker://gcr.io/cloud-marketplace/google/rbe-ubuntu16-04@sha256:5464e3e83dc656fc6e4eae6a01f5c2645f1f7e95854b3802b85e86484132d90e" } properties: { name: "dockerAddCapabilities" @@ -110,12 +110,15 @@ platform( """, ) +# Bazel version on RBE must by in sync with version on Kokoro. +# LINT.IfChange toolchain( name = "cc-toolchain-clang-x86_64-default", exec_compatible_with = [ ], target_compatible_with = [ ], - toolchain = "@bazel_toolchains//configs/ubuntu16_04_clang/10.0.0/bazel_2.0.0/cc:cc-compiler-k8", + toolchain = "@bazel_toolchains//configs/ubuntu16_04_clang/11.0.0/bazel_3.0.0/cc:cc-compiler-k8", toolchain_type = "@bazel_tools//tools/cpp:toolchain_type", ) +# LINT.ThenChange(tools/images/ubuntu1604/20_bazel.sh) diff --git a/tools/images/ubuntu1604/20_bazel.sh b/tools/images/ubuntu1604/20_bazel.sh index bb7afa676..5f668884d 100755 --- a/tools/images/ubuntu1604/20_bazel.sh +++ b/tools/images/ubuntu1604/20_bazel.sh @@ -16,7 +16,10 @@ set -xeo pipefail -declare -r BAZEL_VERSION=2.0.0 +# Bazel version on Kokoro must be kept in sync with RBE. +# LINT.IfChange +declare -r BAZEL_VERSION=3.0.0 +# LINT.ThenChange(../../../BUILD.opensource) # Install bazel dependencies. while true; do |