Patch broken version check in bazel-toolchains.

Reenable RBE pre- and postsubmit. Closes #13503. PiperOrigin-RevId: 375115559
bazelbuild · May 21, 2021 · f8f9dc8 · f8f9dc8
1 parent 28ffaa2
commit f8f9dc8
Show file tree

Hide file tree

Showing 3 changed files with 96 additions and 5 deletions.
diff --git a/.bazelci/postsubmit.yml b/.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/'

diff --git a/.bazelci/presubmit.yml b/.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/'

diff --git a/distdir_deps.bzl b/distdir_deps.bzl
@@ -32,16 +32,18 @@ DIST_DEPS = {
         ],
     },
     "bazel_toolchains": {
-        "archive": "b9bc541aae7bd8e09c6954e2e9da3f7ffe4f77f0.tar.gz",
-        "sha256": "0fe656c3503ee318ba21e3147186b0959ddb8514e4826174e5c178cd1968bdb9",
-        "strip_prefix": "bazel-toolchains-b9bc541aae7bd8e09c6954e2e9da3f7ffe4f77f0",
+        "archive": "bazel-toolchains-4.0.0.tar.gz",
+        "sha256": "1adf5db506a7e3c465a26988514cfc3971af6d5b3c2218925cd6e71ee443fc3f",
+        "strip_prefix": "bazel-toolchains-4.0.0",
         "urls": [
-            #TODO(ilist): mirror and update to 4.0.0 version once it is released
-            "https://github.com/bazelbuild/bazel-toolchains/archive/b9bc541aae7bd8e09c6954e2e9da3f7ffe4f77f0.tar.gz",
+            "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/4.0.0/bazel-toolchains-4.0.0.tar.gz",
+            "https://github.com/bazelbuild/bazel-toolchains/releases/download/4.0.0/bazel-toolchains-4.0.0.tar.gz",
         ],
         "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.