summaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
authorNicolas Lacasse <nlacasse@google.com>2020-05-20 12:15:23 -0700
committergVisor bot <gvisor-bot@google.com>2020-05-20 12:17:06 -0700
commit2374660f11ec61d9e13721a13c8bd0dfe3e7a673 (patch)
tree04cdfe7e9a1fa8265df52bfe56dc75a2f1fdd701 /tools
parent6efce83821d19af03e720a1d34dd9417c2346c35 (diff)
Automated rollback of changelist 312522097
PiperOrigin-RevId: 312529859
Diffstat (limited to 'tools')
-rw-r--r--tools/bazeldefs/BUILD4
-rwxr-xr-xtools/vm/ubuntu1604/20_bazel.sh2
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/bazeldefs/BUILD b/tools/bazeldefs/BUILD
index 335ff6e39..f2f80bae1 100644
--- a/tools/bazeldefs/BUILD
+++ b/tools/bazeldefs/BUILD
@@ -26,7 +26,7 @@ rbe_platform(
remote_execution_properties = """
properties: {
name: "container-image"
- value:"docker://gcr.io/cloud-marketplace/google/rbe-ubuntu16-04@sha256:b516a2d69537cb40a7c6a7d92d0008abb29fba8725243772bdaf2c83f1be2272"
+ value:"docker://gcr.io/cloud-marketplace/google/rbe-ubuntu16-04@sha256:93f7e127196b9b653d39830c50f8b05d49ef6fd8739a9b5b8ab16e1df5399e50"
}
properties: {
name: "dockerAddCapabilities"
@@ -46,6 +46,6 @@ rbe_toolchain(
"manual",
],
target_compatible_with = [],
- toolchain = "@bazel_toolchains//configs/ubuntu16_04_clang/11.0.0/bazel_3.1.0/cc:cc-compiler-k8",
+ toolchain = "@bazel_toolchains//configs/ubuntu16_04_clang/10.0.0/bazel_2.0.0/cc:cc-compiler-k8",
toolchain_type = "@bazel_tools//tools/cpp:toolchain_type",
)
diff --git a/tools/vm/ubuntu1604/20_bazel.sh b/tools/vm/ubuntu1604/20_bazel.sh
index c5d4ced82..bb7afa676 100755
--- a/tools/vm/ubuntu1604/20_bazel.sh
+++ b/tools/vm/ubuntu1604/20_bazel.sh
@@ -16,7 +16,7 @@
set -xeo pipefail
-declare -r BAZEL_VERSION=3.1.0
+declare -r BAZEL_VERSION=2.0.0
# Install bazel dependencies.
while true; do