Skip to content

Commit

Permalink
Fix CI breakages for release-6.2.0 (#17969)
Browse files Browse the repository at this point in the history
* Fix CI breakages for release-6.2.0

- Pin Xcode version to 14.2, due to recent CI infrastructure change, Xcode 13.0 is no longer available.
- Disable GitRepositoryBlackBoxTest

* Disable more tests
  • Loading branch information
meteorcloudy authored Apr 4, 2023
1 parent 2d04c91 commit 2c1a63b
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
8 changes: 7 additions & 1 deletion .bazelci/postsubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -214,6 +214,12 @@ 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"
# https://github.com/bazelbuild/bazel/issues/17456
- "-//src/test/shell/bazel:bazel_determinism_test"
# https://github.com/bazelbuild/bazel/issues/17457
- "-//src/test/shell/bazel:jdeps_test"
include_json_profile:
- build
- test
Expand Down
8 changes: 7 additions & 1 deletion .bazelci/presubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ tasks:
# Re-enable once fixed: https://github.com/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/^#
Expand Down Expand Up @@ -207,6 +207,12 @@ 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"
# https://github.com/bazelbuild/bazel/issues/17456
- "-//src/test/shell/bazel:bazel_determinism_test"
# https://github.com/bazelbuild/bazel/issues/17457
- "-//src/test/shell/bazel:jdeps_test"
windows:
shards: 4
batch_commands:
Expand Down

0 comments on commit 2c1a63b

Please sign in to comment.