Patch broken version check in bazel-toolchains.

.bazelci/postsubmit.yml

@@ -248,6 +248,52 @@ tasks:
     include_json_profile:
       - build
       - test
+  rbe_ubuntu1604:
+    shell_commands:
+      - sed -i.bak
+        -e 's/^# android_sdk_repository/android_sdk_repository/'
+        -e 's/^# android_ndk_repository/android_ndk_repository/' WORKSPACE
+      - rm -f WORKSPACE.bak
+    build_flags:
+      - "--config=ubuntu1604_java8"
+      - "--remote_executor=grpcs://remotebuildexecution.googleapis.com"
+      - "--jobs=200"
+      - "--experimental_remote_download_outputs=minimal"
+      - "--experimental_inmemory_jdeps_files"
+      - "--experimental_inmemory_dotd_files"
+    build_targets:
+      - "//src:bazel"
+      - "//src:bazel_jdk_minimal"
+    test_flags:
+      - "--config=ubuntu1604_java8"
+      - "--remote_executor=grpcs://remotebuildexecution.googleapis.com"
+      - "--jobs=200"
+      - "--experimental_remote_download_outputs=minimal"
+      - "--experimental_inmemory_jdeps_files"
+      - "--experimental_inmemory_dotd_files"
+    test_targets:
+      - "//scripts/..."
+      - "//src/java_tools/..."
+      - "//src/test/..."
+      - "//src/tools/execlog/..."
+      - "//src/tools/singlejar/..."
+      - "//src/tools/workspacelog/..."
+      - "//third_party/ijar/..."
+      - "//tools/aquery_differ/..."
+      - "//tools/python/..."
+      - "//tools/android/..."
+      # See https://github.com/bazelbuild/bazel/issues/8033
+      - "-//src/tools/singlejar:output_jar_simple_test"
+      - "-//src/test/shell/bazel:external_integration_test"
+      - "-//src/test/shell/bazel:bazel_repository_cache_test"
+      - "-//src/test/shell/integration:java_integration_test"
+      - "-//src/test/java/com/google/devtools/build/lib/sandbox/..."
+      # See https://github.com/bazelbuild/bazel/issues/8162 (also disabled for local exec)
+      - "-//src/java_tools/buildjar/..."
+      - "-//src/java_tools/import_deps_checker/..."
+    include_json_profile:
+      - build
+      - test
   kythe_ubuntu2004:
     shell_commands:
     - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/'

.bazelci/presubmit.yml

@@ -236,6 +236,49 @@ tasks:
       - "--test_env=TEST_REPOSITORY_HOME=$OUTPUT_BASE/external"
     test_targets:
       - "//src:all_windows_tests"
+  rbe_ubuntu1604:
+    shell_commands:
+      - sed -i.bak
+        -e 's/^# android_sdk_repository/android_sdk_repository/'
+        -e 's/^# android_ndk_repository/android_ndk_repository/' WORKSPACE
+      - rm -f WORKSPACE.bak
+    build_flags:
+      - "--config=ubuntu1604_java8"
+      - "--remote_executor=grpcs://remotebuildexecution.googleapis.com"
+      - "--jobs=200"
+      - "--experimental_remote_download_outputs=minimal"
+      - "--experimental_inmemory_jdeps_files"
+      - "--experimental_inmemory_dotd_files"
+    build_targets:
+      - "//src:bazel"
+      - "//src:bazel_jdk_minimal"
+    test_flags:
+      - "--config=ubuntu1604_java8"
+      - "--remote_executor=grpcs://remotebuildexecution.googleapis.com"
+      - "--jobs=200"
+      - "--experimental_remote_download_outputs=minimal"
+      - "--experimental_inmemory_jdeps_files"
+      - "--experimental_inmemory_dotd_files"
+    test_targets:
+      - "//scripts/..."
+      - "//src/java_tools/..."
+      - "//src/test/..."
+      - "//src/tools/execlog/..."
+      - "//src/tools/singlejar/..."
+      - "//src/tools/workspacelog/..."
+      - "//third_party/ijar/..."
+      - "//tools/aquery_differ/..."
+      - "//tools/python/..."
+      - "//tools/android/..."
+      # See https://github.com/bazelbuild/bazel/issues/8033
+      - "-//src/tools/singlejar:output_jar_simple_test"
+      - "-//src/test/shell/bazel:external_integration_test"
+      - "-//src/test/shell/bazel:bazel_repository_cache_test"
+      - "-//src/test/shell/integration:java_integration_test"
+      - "-//src/test/java/com/google/devtools/build/lib/sandbox/..."
+      # See https://github.com/bazelbuild/bazel/issues/8162 (also disabled for local exec)
+      - "-//src/java_tools/buildjar/..."
+      - "-//src/java_tools/import_deps_checker/..."
   kythe_ubuntu2004:
     shell_commands:
     - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/'

distdir_deps.bzl

@@ -42,6 +42,8 @@ DIST_DEPS = {
         "used_in": [
             "additional_distfiles",
         ],
+        "patch_args": ["-p1"],
+        "patches": ["//third_party/bazel-toolchains:bazel-toolchains-4.0.0-fix-version-check.patch"],
     },
     # Keep in sync with src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/cc_configure.WORKSPACE.
     # Keep in sync with src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE.

third_party/bazel-toolchains/bazel-toolchains-4.0.0-fix-version-check.patch

@@ -0,0 +1,13 @@
+diff --git a/rules/rbe_repo/build_gen.bzl b/rules/rbe_repo/build_gen.bzl
+index 833fc1f..bdce12c 100644
+--- a/rules/rbe_repo/build_gen.bzl
++++ b/rules/rbe_repo/build_gen.bzl
+@@ -90,7 +90,7 @@ def create_java_runtime(ctx, java_home, java_version):
+       java_version: the Java runtime release version
+     """
+     bazel_version = tuple([int(n) for n in ctx.attr.bazel_version.split(".")])
+-    if bazel_version > (4, 0, 0) or not native.bazel_version:
++    if bazel_version > (5, 0, 0) or not native.bazel_version:
+         template = ctx.path(Label("@bazel_toolchains//rules/rbe_repo:BUILD.local_java_runtime.tpl"))
+     else:
+         template = ctx.path(Label("@bazel_toolchains//rules/rbe_repo:BUILD.java.tpl"))