Skip to content

[overlay-syncup] sync overlay changes to Linux #116

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 2 commits into from
Jul 28, 2016

Conversation

mwwa
Copy link
Contributor

@mwwa mwwa commented Jul 21, 2016

First cut at pulling in the recent Swift overlay changes and get them
building on Linux.

@mwwa
Copy link
Contributor Author

mwwa commented Jul 21, 2016

@swift-ci please test

@mwwa
Copy link
Contributor Author

mwwa commented Jul 21, 2016

@dgrove-oss Here's the syncup for my changes. The only way I can build for Linux is via the CI bot, so there'll be some back and forth spam as I fix up any build errors that I've got.

@mwwa
Copy link
Contributor Author

mwwa commented Jul 21, 2016

@swift-ci please test

@mwwa mwwa self-assigned this Jul 21, 2016
@mwwa
Copy link
Contributor Author

mwwa commented Jul 21, 2016

@swift-ci please test

6 similar comments
@mwwa
Copy link
Contributor Author

mwwa commented Jul 21, 2016

@swift-ci please test

@mwwa
Copy link
Contributor Author

mwwa commented Jul 21, 2016

@swift-ci please test

@mwwa
Copy link
Contributor Author

mwwa commented Jul 21, 2016

@swift-ci please test

@mwwa
Copy link
Contributor Author

mwwa commented Jul 21, 2016

@swift-ci please test

@mwwa
Copy link
Contributor Author

mwwa commented Jul 21, 2016

@swift-ci please test

@mwwa
Copy link
Contributor Author

mwwa commented Jul 21, 2016

@swift-ci please test

@seabaylea
Copy link
Contributor

Note that the libdispatch CI builds are currently failing with the following

/home/buildnode/jenkins/workspace/oss-swift-incremental-RA-libdispatch-linux-ubuntu-15_10/swift-corelibs-libdispatch/src/swift/Wrapper.swift:18:1: error: '@noreturn' has been removed; functions that never return should have a return type of 'Never' instead
@noreturn public func dispatchMain() {
^~~~~~~~~~
                                     -> Never

Its probably worth fixing that in this PR rather than risk having a merge conflict.

@mwwa
Copy link
Contributor Author

mwwa commented Jul 25, 2016

@swift-ci please test

6 similar comments
@mwwa
Copy link
Contributor Author

mwwa commented Jul 25, 2016

@swift-ci please test

@mwwa
Copy link
Contributor Author

mwwa commented Jul 25, 2016

@swift-ci please test

@mwwa
Copy link
Contributor Author

mwwa commented Jul 25, 2016

@swift-ci please test

@mwwa
Copy link
Contributor Author

mwwa commented Jul 25, 2016

@swift-ci please test

@mwwa
Copy link
Contributor Author

mwwa commented Jul 25, 2016

@swift-ci please test

@mwwa
Copy link
Contributor Author

mwwa commented Jul 25, 2016

@swift-ci please test

@seabaylea
Copy link
Contributor

Looks like the build was ok, but a couple of the tests failed:

FAIL: dispatch_priority
FAIL: dispatch_priority2

Those aren't related to the changes in the PR. I've also seen an intermittent failure in dispatch_priority2 and dispatch_read2 in the libdispatch CI, so it might be worth disabling the following three tests for now:

dispatch_priority
dispatch_priority2
dispatch_read2

@mwwa mwwa force-pushed the overlay-syncup branch from 3f0aca6 to 087d36d Compare July 27, 2016 21:37
Sync up recent Swift overlay changes into swift-corelibs-dispatch and
get them building for Linux.
@mwwa mwwa force-pushed the overlay-syncup branch from 087d36d to ca4b5e9 Compare July 27, 2016 21:40
@mwwa
Copy link
Contributor Author

mwwa commented Jul 27, 2016

@swift-ci please test

1 similar comment
@mwwa
Copy link
Contributor Author

mwwa commented Jul 27, 2016

@swift-ci please test

@mwwa mwwa force-pushed the overlay-syncup branch from 4dc2830 to 1aa41c5 Compare July 27, 2016 22:31
@mwwa
Copy link
Contributor Author

mwwa commented Jul 27, 2016

@swift-ci please test

@mwwa mwwa force-pushed the overlay-syncup branch from 1aa41c5 to 522a73f Compare July 27, 2016 22:56
@mwwa
Copy link
Contributor Author

mwwa commented Jul 27, 2016

@swift-ci please test

@mwwa mwwa merged commit 98d0a05 into swiftlang:master Jul 28, 2016
@mwwa mwwa deleted the overlay-syncup branch July 28, 2016 17:09
das pushed a commit that referenced this pull request Aug 11, 2016
[overlay-syncup] sync overlay changes to Linux

Signed-off-by: Daniel A. Steffen <dsteffen@apple.com>
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