Skip to content
Permalink
Browse files

Fix the Xcode version detection which got broken by the upgrade to Xc…

  • Loading branch information
philwo authored and Copybara-Service committed Sep 26, 2018
1 parent 8e4ddb6 commit 71926bc25b3b91fcb44471e2739b89511807f96b
Showing with 2 additions and 7 deletions.
  1. +2 −7 src/test/shell/bazel/apple/bazel_apple_test.sh
@@ -31,13 +31,8 @@ function set_up() {
copy_examples
setup_objc_test_support

# Find the version number for an installed 7-series or 8-series Xcode
# (any sub-version will do)
bazel query "labels('versions', '@local_config_xcode//:host_xcodes')" \
--output xml | grep 'name="version"' \
| sed -E 's/.*(value=\"(([0-9]|.)+))\".*/\2/' > xcode_versions

XCODE_VERSION=$(cat xcode_versions | grep -m1 '7\|8\|9')
# Find the version number for an installed Xcode.
XCODE_VERSION=$(xcodebuild -version | grep ^Xcode | cut -d' ' -f2)

# Allow access to //external:xcrunwrapper.
use_bazel_workspace_file

0 comments on commit 71926bc

Please sign in to comment.
You can’t perform that action at this time.