diff options
| author |  Bill Feng <yfen@google.com> | 2019-01-09 10:57:53 -0800 |
|---|---|---|
| committer | Bill Feng <yfen@google.com> | 2019-01-09 10:57:53 -0800 |
| commit | eda9742bbdb4899c6661509981abab729a7044e8 (patch) | |
| tree | 883ed06b76d660a91ef9f871071fccf8d9d22fce | |
| parent | 3a59faf632427f26bc8dceed46c1fe748fd7df3c (diff) | |
updated bazel and RBE instance versions
| -rw-r--r-- | third_party/toolchains/BUILD | 12 | ||||
| -rw-r--r-- | tools/remote_build/rbe_common.bazelrc | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/third_party/toolchains/BUILD b/third_party/toolchains/BUILD index e213461acc..2499d1c788 100644 --- a/third_party/toolchains/BUILD +++ b/third_party/toolchains/BUILD @@ -20,17 +20,17 @@ package(default_visibility = ["//visibility:public"]) # Update every time when a new container is released. alias( name = "rbe_ubuntu1604", - actual = ":rbe_ubuntu1604_r342117", + actual = ":rbe_ubuntu1604_r346485", ) alias( name = "rbe_ubuntu1604_large", - actual = ":rbe_ubuntu1604_r342117_large", + actual = ":rbe_ubuntu1604_r346485_large", ) -# RBE Ubuntu16_04 r342117 +# RBE Ubuntu16_04 r346485 platform( - name = "rbe_ubuntu1604_r342117", + name = "rbe_ubuntu1604_r346485", constraint_values = [ "@bazel_tools//platforms:x86_64", "@bazel_tools//platforms:linux", @@ -51,9 +51,9 @@ platform( """, ) -# RBE Ubuntu16_04 r342117 large +# RBE Ubuntu16_04 r346485 large platform( - name = "rbe_ubuntu1604_r342117_large", + name = "rbe_ubuntu1604_r346485_large", constraint_values = [ "@bazel_tools//platforms:x86_64", "@bazel_tools//platforms:linux", diff --git a/tools/remote_build/rbe_common.bazelrc b/tools/remote_build/rbe_common.bazelrc index aa3ddb050c..8cf17a3086 100644 --- a/tools/remote_build/rbe_common.bazelrc +++ b/tools/remote_build/rbe_common.bazelrc @@ -18,7 +18,7 @@ startup --host_jvm_args=-Dbazel.DigestFunction=SHA256 -build --crosstool_top=@com_github_bazelbuild_bazeltoolchains//configs/ubuntu16_04_clang/1.1/bazel_0.16.1/default:toolchain +build --crosstool_top=@com_github_bazelbuild_bazeltoolchains//configs/ubuntu16_04_clang/1.1/bazel_0.20.0/default:toolchain build --extra_toolchains=//third_party/toolchains:cc-toolchain-clang-x86_64-default # Use custom execution platforms defined in third_party/toolchains build --extra_execution_platforms=//third_party/toolchains:rbe_ubuntu1604,//third_party/toolchains:rbe_ubuntu1604_large @@ -61,9 +61,9 @@ build:msan --cxxopt=--stdlib=libc++ # setting LD_LIBRARY_PATH is necessary # to avoid "libc++.so.1: cannot open shared object file" build:msan --action_env=LD_LIBRARY_PATH=/usr/local/lib -build:msan --host_crosstool_top=@com_github_bazelbuild_bazeltoolchains//configs/ubuntu16_04_clang/1.1/bazel_0.16.1/default:toolchain +build:msan --host_crosstool_top=@com_github_bazelbuild_bazeltoolchains//configs/ubuntu16_04_clang/1.1/bazel_0.20.0/default:toolchain # override the config-agnostic crosstool_top -build:msan --crosstool_top=@com_github_bazelbuild_bazeltoolchains//configs/ubuntu16_04_clang/1.1/bazel_0.16.1/msan:toolchain +build:msan --crosstool_top=@com_github_bazelbuild_bazeltoolchains//configs/ubuntu16_04_clang/1.1/bazel_0.20.0/msan:toolchain # thread sanitizer: most settings are already in %workspace%/.bazelrc # we only need a few additional ones that are Foundry specific @@ -79,7 +79,7 @@ build:ubsan --copt=-gmlt # TODO(jtattermusch): use more reasonable test timeout build:ubsan --test_timeout=3600 # override the config-agnostic crosstool_top ---crosstool_top=@com_github_bazelbuild_bazeltoolchains//configs/experimental/ubuntu16_04_clang/1.1/bazel_0.16.1/ubsan:toolchain +--crosstool_top=@com_github_bazelbuild_bazeltoolchains//configs/experimental/ubuntu16_04_clang/1.1/bazel_0.20.0/ubsan:toolchain # TODO(jtattermusch): remove this once Foundry adds the env to the docker image. # ubsan needs symbolizer to work properly, otherwise the suppression file doesn't work # and we get test failures. |