build-script: allow non-zero exit codes from 'xcodebuild -version -sdk' #2877
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -30,7 +30,8 @@ def print_xcodebuild_versions(file=sys.stdout): | |||
| version = shell.capture( | |||
| ['xcodebuild', '-version'], dry_run=False, echo=False).rstrip() | |||
| sdks = shell.capture( | |||
| ['xcodebuild', '-version', '-sdk'], dry_run=False, echo=False).rstrip() | |||
| ['xcodebuild', '-version', '-sdk'], dry_run=False, echo=False, | |||
| allow_non_zero_exit=True).rstrip() | |||
There was a problem hiding this comment.
Probably a good idea to have a comment here explaining why this is necessary, so someone doesn't accidentally remove it.
|
LGTM |
Under certain obscure circumstances (incomplete SDKs), xcodebuild can successfully work with the SDK and print its version number, but will still exit with a non-zero code. This change works around the issue by ignoring the exit code.
gribozavr
force-pushed
the
build-script-allow-non-zero-xcodebuild-sdk-version
branch
from
445f371 to
c55e89f
Compare
|
@swift-ci Please smoke test |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Under certain obscure circumstances (incomplete SDKs), xcodebuild can
successfully work with the SDK and print its version number, but will
still exit with a non-zero code. This change works around the issue by
ignoring the exit code.
Before merging this pull request to apple/swift repository:
Triggering Swift CI
The swift-ci is triggered by writing a comment on this PR addressed to the GitHub user @swift-ci. Different tests will run depending on the specific comment that you use. The currently available comments are:
Smoke Testing
Validation Testing
Lint Testing
Note: Only members of the Apple organization can trigger swift-ci.