-
Notifications
You must be signed in to change notification settings - Fork 10.5k
Update build-script and CMake to support the Xcode CI bot again #26705
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
Conversation
preset=buildbot_incremental,tools=RA,stdlib=RA,xcode |
@swift-ci Please test |
Ugh, I did that wrong. apple/swift-llvm#165 |
Welp. Something up with the version of CMake on the bots? |
Build failed |
Build failed |
These can be config-specific when building using Xcode. I probably still missed a few, but this is enough to build and test Swift, at least. Should be no change for Ninja users.
LLVM was setting config-specific paths that overrode the ones provided here. We don't actually care about configuration for this dummy, testing-only library, so just force it back to a flat layout based on target platform. No functionality change for Ninja users.
This is our /only/ standard Xcode preset, and it's been disabled for a long time. Since only a limited configuration is supported for building with Xcode (pretty much just LLVM and Swift, with only a macOS standard library), it doesn't make sense to base it on the regular incremental preset. Pare it down to what's most important to keep working in hopes of turning the bot back on.
2eae9dc
to
2c069c4
Compare
apple/swift-llvm#165 |
Maybe I can't fool the preset testing into doing an Xcode test. @shahmishal? @swift-ci Please smoke test |
|
Yeah, I saw that error, and it is meaningless to me. Unless our CMake install is too old on these bots? Which seems unlikely. |
apple/swift-llvm#165 |
Trying to get https://ci.swift.org/job/oss-swift-incremental-RA-macOS-xcode/ back online. We shut it down because it was flaky, but I haven't been able to reproduce the flakiness with the Xcode 11 betas, so maybe it's time to turn it back on. It's bit-rotted in the meantime, though, so these few commits get it working again (at least for building Swift itself).
Requires apple/swift-llvm#165.