From 94785fb971477875d5a9233dfd21610c2a53129d Mon Sep 17 00:00:00 2001 From: Yun Peng Date: Tue, 4 Apr 2023 10:43:41 +0200 Subject: [PATCH] Fix CI breakages for release-6.2.0 - Remove pinned Xcode version, due to recent CI infrastructure change, Xcode 13.0 is no longer available. - Disable GitRepositoryBlackBoxTest --- .bazelci/postsubmit.yml | 3 ++- .bazelci/presubmit.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.bazelci/postsubmit.yml b/.bazelci/postsubmit.yml index 260dc2709307c8..9dd8723ae12bed 100644 --- a/.bazelci/postsubmit.yml +++ b/.bazelci/postsubmit.yml @@ -158,7 +158,6 @@ tasks: - build - test macos: - xcode_version: "13.0" shell_commands: - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^# android_ndk_repository/android_ndk_repository/' WORKSPACE @@ -214,6 +213,8 @@ tasks: - "-//src/test/java/com/google/devtools/build/lib/platform:SystemMemoryPressureEventTest" # https://github.com/bazelbuild/bazel/issues/17411 - "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:PatchApiBlackBoxTest" + # https://github.com/bazelbuild/bazel/issues/17447 + - "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:GitRepositoryBlackBoxTest" include_json_profile: - build - test diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml index 704b86589f2c07..ac82eee500958b 100644 --- a/.bazelci/presubmit.yml +++ b/.bazelci/presubmit.yml @@ -148,7 +148,6 @@ tasks: # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162 - "-//src/java_tools/import_deps_checker/..." macos: - xcode_version: "13.0" shards: 5 shell_commands: - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^# @@ -207,6 +206,8 @@ tasks: - "-//src/test/java/com/google/devtools/build/lib/platform:SystemMemoryPressureEventTest" # https://github.com/bazelbuild/bazel/issues/17411 - "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:PatchApiBlackBoxTest" + # https://github.com/bazelbuild/bazel/issues/17447 + - "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:GitRepositoryBlackBoxTest" windows: shards: 4 batch_commands: