Merge branch 'release-6.2.0' into cherry-pick-17351

bazelbuild · Apr 4, 2023 · 4b80c8c · 4b80c8c
2 parents 30aa5c1 + 2c1a63b
commit 4b80c8c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/.bazelci/postsubmit.yml b/.bazelci/postsubmit.yml
@@ -158,7 +158,7 @@ tasks:
  - build
  - test
  macos:
- xcode_version: "13.0"
+ xcode_version: "14.2"
  shell_commands:
  - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
  android_ndk_repository/android_ndk_repository/' WORKSPACE
@@ -214,6 +214,12 @@ tasks:
  - "-//src/test/java/com/google/devtools/build/lib/platform:SystemMemoryPressureEventTest"
  # https:/bazelbuild/bazel/issues/17411
  - "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:PatchApiBlackBoxTest"
+ # https:/bazelbuild/bazel/issues/17447
+ - "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:GitRepositoryBlackBoxTest"
+ # https:/bazelbuild/bazel/issues/17456
+ - "-//src/test/shell/bazel:bazel_determinism_test"
+ # https:/bazelbuild/bazel/issues/17457
+ - "-//src/test/shell/bazel:jdeps_test"
  include_json_profile:
  - build
  - test

diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
@@ -148,7 +148,7 @@ tasks:
  # Re-enable once fixed: https:/bazelbuild/bazel/issues/8162
  - "-//src/java_tools/import_deps_checker/..."
  macos:
- xcode_version: "13.0"
+ xcode_version: "14.2"
  shards: 5
  shell_commands:
  - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
@@ -207,6 +207,12 @@ tasks:
  - "-//src/test/java/com/google/devtools/build/lib/platform:SystemMemoryPressureEventTest"
  # https:/bazelbuild/bazel/issues/17411
  - "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:PatchApiBlackBoxTest"
+ # https:/bazelbuild/bazel/issues/17447
+ - "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:GitRepositoryBlackBoxTest"
+ # https:/bazelbuild/bazel/issues/17456
+ - "-//src/test/shell/bazel:bazel_determinism_test"
+ # https:/bazelbuild/bazel/issues/17457
+ - "-//src/test/shell/bazel:jdeps_test"
  windows:
  shards: 4
  batch_commands: