[5.1] Update swift-5.1-branch to match the swiftpm branch point #103
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
We have clangd in the toolchain now, and it's sufficient to pass our minimal tests. Unfortunately it's hitting frequent assertion failures during editing, so not marking as supported yet.
Update recommended toolchain to 2019-02-14-a
While the toolchains build clangd now, not all the bots are building it, so we cannot require it yet.
Undo optimisim around requiring clangd during testing
Hardcoding the triples was silly; the only interesting platform difference is about which parts have a version number on macOS and which do not.
[test] Make swiftpm test robust against host triple differences
This seems to be a commonly used syntax package for swift, so add it to the config so it will work without troubleshooting.
[editors] Add alternative swift syntax spec to sublime config
Workaround perf test running too many iterations
Always use the latest indexstore-db and swiftpm from the corresponding branch (currently master). This is important for swiftpm, because it does not *guarantee* stable behaviour, so we need to match the version. It also makes sourcekit-lsp behave more like the rest of the swift toolchain projects, who all live on HEAD for their dependencies.
Now that we are building with HEAD swiftpm, change the recommended toolchain to be whatever the latest available snapshot is. If you are developing on ToT sourcekit-lsp, then using the latest snapshot is going to have the closest match other than building the whole toolchain from source.
Now that we build with HEAD, developers are more likely to need to run swift-package-udpate themselves, so mention it in the build instructions.
Remove Package.resolved and move to depending on HEAD
Add how to add code cmd in the terminal
SwiftPM's POSIX is going removed soon in order to make it more cross-platform. This removes all usage of POSIX from sourcekit-lsp. <rdar://problem/49198341> Move sourcekit-lsp off of SwiftPM's POSIX
Move sourcekit-lsp off of SwiftPM's POSIX
`swift build -Xcxx -I/usr/lib/swift` fails on Linux w/
```
.../sourcekit-lsp/.build/checkouts/indexstore-db/lib/CIndexStoreDB/CIndexStoreDB.cpp:20:10: fatal error: 'Block.h' file not found
#include <Block.h>
^~~~~~~~~
1 error generated.
```
Need to add `-I/usr/lib/swift/Block` to make it work. Confirmed via https://github.com/apple/indexstore-db
On Linux, must include full path to `Block.h`
This test will (rarely) delete enough of the string to trip over empty line and column ranges. After this fix it should be fine to completely empty the string.
[test] Fix rare failure in LineTable editing test
Fixup SourceKit module on Windows
Get the pid of the current process using Foundation
Semantically, we want our branch point to match swiftpm, but all of the changes since then also look good to take into the branch, so just do one last merge from master.
|
@swift-ci please test |
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.
Semantically, we want our branch point to match swiftpm, but all of the
changes since then also look good to take into the branch, so just do
one last merge from master.