Skip to content

Conversation

@jrose-apple
Copy link
Contributor

@jrose-apple jrose-apple commented Apr 17, 2019

Cherry-picks @slavapestov's #23280 and #23336 in cut-down form for the old 5.1 branch, for Apple-internal purposes.

rdar://problem/49985713

@jrose-apple
Copy link
Contributor Author

@swift-ci Please test

@slavapestov
Copy link
Contributor

Thanks

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - d7908713cc642d66702ddb915d3ce494585771bf

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - d7908713cc642d66702ddb915d3ce494585771bf

jrose-apple and others added 2 commits April 17, 2019 13:41
…driver flag

This is cut down from the version on the proper 5.1 branch in order to
cause fewer merge conflicts. It also won't test cleanly until the next
commit.

(Based on 8e14023)
Bring back -Xfrontend -enable-resilience temporarily

(cherry picked from commit de75829)
@jrose-apple jrose-apple force-pushed the 5.1-EARLY-enable-library-evolution branch from d790871 to 70d0a2f Compare April 17, 2019 20:41
@jrose-apple
Copy link
Contributor Author

Linux failure is because swift-corelibs-foundation doesn't have an early branch.

macOS failure is because I forgot to update tests, so let's try that again.

@swift-ci Please test macOS

@jrose-apple
Copy link
Contributor Author

@swift-ci Please test macOS

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - d7908713cc642d66702ddb915d3ce494585771bf

@jrose-apple jrose-apple merged commit 2418b54 into swiftlang:swift-5.1-branch-03-18-2019 Apr 17, 2019
@jrose-apple jrose-apple deleted the 5.1-EARLY-enable-library-evolution branch April 17, 2019 23:28
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