Skip to content

Commit

Permalink
Bazel CI: Let the CI pick the correct Xcode version.
Browse files Browse the repository at this point in the history
[bazelbuild#1542](bazelbuild/continuous-integration#1542) added some logic to pick the best Xcode version based on the MacOS version (which unfortunately differs between machines).

This should fix the failures related to [bazelbuild#1540](bazelbuild/continuous-integration#1540) in both pre- and post-submit pipelines.

PiperOrigin-RevId: 506279891
Change-Id: I4f22c1bfdf616a2cc4d06a1e6a242556c3863882
  • Loading branch information
fweikert authored and copybara-github committed Feb 1, 2023
1 parent 25be211 commit 0aded54
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 4 deletions.
2 changes: 0 additions & 2 deletions .bazelci/postsubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,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
Expand Down Expand Up @@ -213,7 +212,6 @@ tasks:
- build
- test
macos_arm64:
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
Expand Down
2 changes: 0 additions & 2 deletions .bazelci/presubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,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/^#
Expand Down Expand Up @@ -203,7 +202,6 @@ tasks:
# MacOS does not have cgroups so it can't support hardened sandbox
- "-//src/test/shell/integration:bazel_hardened_sandboxed_worker_test"
macos_arm64:
xcode_version: "13.0"
shards: 2
shell_commands:
- sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
Expand Down

0 comments on commit 0aded54

Please sign in to comment.