Skip to content

[build-presets] Foundation built based on platform #1764

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 23, 2016

Conversation

modocache
Copy link
Contributor

What's in this pull request?

Yet another attempt at getting the XCTest build preset to work on both Linux and OS X.

Previously, the XCTest CI preset would attempt to build corelibs-foundation on OS X. corelibs-foundation is not meant to be built via the build-script on OS X, so this would cause issues.

Remove the explicit --foundation option, and instead leave it up to the build-script to determine whether to build corelibs-foundation when building XCTest.

Resolved bug number: None


Before merging this pull request to apple/swift repository:

  • Test pull request on Swift continuous integration.

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

Platform Comment
All supported platforms @swift-ci Please smoke test
OS X platform @swift-ci Please smoke test OS X platform
Linux platform @swift-ci Please smoke test Linux platform

Validation Testing

Platform Comment
All supported platforms @swift-ci Please test
OS X platform @swift-ci Please test OS X platform
Linux platform @swift-ci Please test Linux platform

Note: Only members of the Apple organization can trigger swift-ci.

Previously, the XCTest CI preset would attempt to build
corelibs-foundation on OS X. corelibs-foundation is not meant to be
built via the build-script on OS X, so this would cause issues.

Remove the explicit `--foundation` option, and instead leave it up to
the build-script to determine whether to build Foundation when building
XCTest.
@modocache
Copy link
Contributor Author

@shahmishal Unfortunately swiftlang/swift-corelibs-xctest#77 looks like it still failed on OS X. I think this change could get things working.

@shahmishal
Copy link
Member

@swift-ci Please test and merge

@swift-ci swift-ci merged commit 5b1bb65 into swiftlang:master Mar 23, 2016
@modocache modocache deleted the build-presets-xctest-ci branch March 23, 2016 08:36
@modocache
Copy link
Contributor Author

Thanks, @shahmishal! Could you ask @swift-ci to please test swiftlang/swift-corelibs-xctest#77 again? 🙇

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants