diff options
| -rw-r--r-- | .bazelrc_rbe | 20 | ||||
| -rw-r--r-- | WORKSPACE | 8 | ||||
| -rw-r--r-- | test/BUILD | 4 |
3 files changed, 13 insertions, 19 deletions
diff --git a/.bazelrc_rbe b/.bazelrc_rbe index 102eac397..8c663ad0a 100644 --- a/.bazelrc_rbe +++ b/.bazelrc_rbe @@ -13,7 +13,7 @@ # limitations under the License. # Note for gVisor authors: -# This version is a derivative of: bazel-0.20.0.bazelrc +# This version is a derivative of: bazel-0.23.0.bazelrc # From: https://github.com/bazelbuild/bazel-toolchains/blob/master/bazelrc/bazel-0.20.0.bazelrc # This .bazelrc file contains all of the flags required for the toolchain, @@ -33,15 +33,15 @@ build:remote --jobs=50 # Set several flags related to specifying the platform, toolchain and java # properties. # These flags are duplicated rather than imported from (for example) -# %workspace%/configs/ubuntu16_04_clang/1.1/toolchain.bazelrc to make this +# %workspace%/configs/ubuntu16_04_clang/1.2/toolchain.bazelrc to make this # bazelrc a standalone file that can be copied more easily. # 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=@bazel_toolchains//configs/ubuntu16_04_clang/1.1:jdk8 -build:remote --javabase=@bazel_toolchains//configs/ubuntu16_04_clang/1.1:jdk8 +build:remote --host_javabase=@bazel_toolchains//configs/ubuntu16_04_clang/1.2:jdk8 +build:remote --javabase=@bazel_toolchains//configs/ubuntu16_04_clang/1.2:jdk8 build:remote --host_java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8 build:remote --java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8 -build:remote --crosstool_top=@bazel_toolchains//configs/ubuntu16_04_clang/1.1/bazel_0.20.0/default:toolchain +build:remote --crosstool_top=@bazel_toolchains//configs/ubuntu16_04_clang/1.2/bazel_0.23.0/default:toolchain build:remote --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1 # Platform flags: # The toolchain container used for execution is defined in the target indicated @@ -62,7 +62,7 @@ build:remote --platforms=//test:rbe_ubuntu1604 build:remote --spawn_strategy=remote build:remote --strategy=Javac=remote build:remote --strategy=Closure=remote -build:remote --genrule_strategy=remote +build:remote --strategy=Genrule=remote build:remote --define=EXECUTOR=remote # Enable the remote cache so action results can be shared across machines, @@ -75,11 +75,6 @@ build:remote --remote_executor=remotebuildexecution.googleapis.com # Enable encryption. build:remote --tls_enabled=true -# 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 --experimental_strict_action_env=true - # Set a higher timeout value, just in case. build:remote --remote_timeout=3600 @@ -112,10 +107,9 @@ build:results-local --bes_results_url="https://source.cloud.google.com/results/i # across machines, developers, and workspaces. build:remote-cache --remote_cache=remotebuildexecution.googleapis.com build:remote-cache --tls_enabled=true -build:remote-cache --experimental_strict_action_env=true build:remote-cache --remote_timeout=3600 build:remote-cache --auth_enabled=true build:remote-cache --spawn_strategy=standalone build:remote-cache --strategy=Javac=standalone build:remote-cache --strategy=Closure=standalone -build:remote-cache --genrule_strategy=standalone +build:remote-cache --strategy=Genrule=standalone @@ -21,12 +21,12 @@ gazelle_dependencies() # See releases at https://releases.bazel.build/bazel-toolchains.html http_archive( name = "bazel_toolchains", + sha256 = "4b1468b254a572dbe134cc1fd7c6eab1618a72acd339749ea343bd8f55c3b7eb", + strip_prefix = "bazel-toolchains-d665ccfa3e9c90fa789671bf4ef5f7c19c5715c4", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/31b5dc8c4e9c7fd3f5f4d04c6714f2ce87b126c1.tar.gz", - "https://github.com/bazelbuild/bazel-toolchains/archive/31b5dc8c4e9c7fd3f5f4d04c6714f2ce87b126c1.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/d665ccfa3e9c90fa789671bf4ef5f7c19c5715c4.tar.gz", + "https://github.com/bazelbuild/bazel-toolchains/archive/d665ccfa3e9c90fa789671bf4ef5f7c19c5715c4.tar.gz", ], - strip_prefix = "bazel-toolchains-31b5dc8c4e9c7fd3f5f4d04c6714f2ce87b126c1", - sha256 = "07a81ee03f5feae354c9f98c884e8e886914856fb2b6a63cba4619ef10aaaf0b", ) # External repositories, in sorted order. diff --git a/test/BUILD b/test/BUILD index 6b83757f6..e99b4e501 100644 --- a/test/BUILD +++ b/test/BUILD @@ -24,7 +24,7 @@ platform( remote_execution_properties = """ properties: { name: "container-image" - value:"docker://gcr.io/cloud-marketplace/google/rbe-ubuntu16-04@sha256:f3120a030a19d67626ababdac79cc787e699a1aa924081431285118f87e7b375" + value:"docker://gcr.io/cloud-marketplace/google/rbe-ubuntu16-04@sha256:69c9f1652941d64a46f6f7358a44c1718f25caa5cb1ced4a58ccc5281cd183b5" } properties: { name: "dockerAddCapabilities" @@ -43,6 +43,6 @@ toolchain( ], target_compatible_with = [ ], - toolchain = "@bazel_toolchains//configs/ubuntu16_04_clang/1.1/bazel_0.20.0/default:cc-compiler-k8", + toolchain = "@bazel_toolchains//configs/ubuntu16_04_clang/1.2/bazel_0.23.0/default:cc-compiler-k8", toolchain_type = "@bazel_tools//tools/cpp:toolchain_type", ) |