Resolve conflicts and use forked SourceKit-LSP in 5.3 branch #1949
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
MaxDesiatov
added
continuous integration
The default package of `apt install clang` is clang-6 and it overwrite default installed clang 9.0
MaxDesiatov
force-pushed
the
swiftwasm-release/5.3-sourcekit-lsp
branch
from
8b443fd to
e6e2ad3
Compare
MaxDesiatov
changed the title
|
@kateinoigakukun both Ubuntu 18.04 and 20.04 now fail with |
|
I wonder if it could have anything to do with clang headers symlink that you've fixed in the |
|
It builds on Ubuntu 20.04 on Google Cloud Engine, so there's definitely something on GHA runners that breaks the build... |
|
FYI: You can debug on GitHub Actions runner using https://github.com/mxschmitt/action-tmate |
Looks like its headers break indexstore-db build
|
It passes! 🎉 Ready for review 🙂 |
|
The macOS smoke test is stuck for some reason, but that's definitely unrelated. |
kateinoigakukun
approved these changes
Oct 13, 2020
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.
The fork of SourceKit-LSP allows passing the
--destinationoption to it, which is then forwarded to SwiftPM.The fork changes were submitted upstream in swiftlang/sourcekit-lsp#330, so most probably we won't need to use the fork in the
swiftwasmbranch.Resolves #1935
Resolves #1962