-
Notifications
You must be signed in to change notification settings - Fork 254
Use xcrun to discover Apple SDK paths #912
Conversation
45cdbbe to
7d94ab5
Compare
7d94ab5 to
992e962
Compare
77e6278 to
de7162c
Compare
de7162c to
b008c6e
Compare
b008c6e to
17e20e5
Compare
build/config/ios/ios_sdk.py
Outdated
| sdk_output = run_command_with_retry(command, timeout=300) | ||
| if args.xcode is not None: | ||
| if sdk in ['iphoneos']: | ||
| sdk_output = os.path.join(args.xcode, 'iPhoneOS.platform/Developer/SDKs/iPhoneOS17.0.sdk') |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I really don't want the version hardcoded since this is coming from the Xcode sdk version in the .ci.yaml.
Can we try swapping the ios_sdk and mac_sdk python script to xcrun --sdk <sdk> --show-sdk-path instead, and see if it still times out?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree, and I'll try that, yeah.
17e20e5 to
d1dc0e9
Compare
|
@jmagman flutter/engine#55818 is all green, so I think this is working. |
jmagman
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Cross referencing with flutter/flutter#94513 re: the first attempt to use hard-coded strings.
LGTM, thank you, @zanderso!
This change switches from using `xcodebuild` to `xcrun` for discovering the paths of installed Apple SDKs. `xcrun` tries reading this information from a cache first, which may help avoid timeouts in CI. Related flutter/flutter#155106
flutter/engine@b39fec6...ea311c9 2024-10-12 zanderso@users.noreply.github.com Roll buildroot for flutter/buildroot#912 (flutter/engine#55818) 2024-10-12 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Manual roll Dart SDK from d916a5f69a48 to 75bf9e183a33 (1 revision) (#55838)" (flutter/engine#55850) 2024-10-12 flar@google.com Delete last usages of MockCanvas test mechanism (flutter/engine#55840) 2024-10-12 skia-flutter-autoroll@skia.org Roll Skia from 97cebfb06139 to d2833b68c8c7 (9 revisions) (flutter/engine#55846) 2024-10-12 jonahwilliams@google.com [Impeller] delete a bunch of dead filter code. (flutter/engine#55841) 2024-10-12 55750689+AthulJoseph27@users.noreply.github.com [Impeller] Added support to set polygon mode in Flutter GPU. (flutter/engine#55804) 2024-10-11 skia-flutter-autoroll@skia.org Manual roll Dart SDK from d916a5f69a48 to 75bf9e183a33 (1 revision) (flutter/engine#55838) 2024-10-11 skia-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from 1OZ2rHDklRNSZRUrc... to tNuwSyjjbdU9HjOwQ... (flutter/engine#55837) Also rolling transitive DEPS: fuchsia/sdk/core/linux-amd64 from 1OZ2rHDklRNS to tNuwSyjjbdU9 If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-engine-flutter-autoroll Please CC jacksongardner@google.com,zra@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
This change switches from using `xcodebuild` to `xcrun` for discovering the paths of installed Apple SDKs. `xcrun` tries reading this information from a cache first, which may help avoid timeouts in CI. Related flutter#155106
Tested in flutter/engine#55818