Skip to content

Resolve conflicts and use forked SourceKit-LSP in 5.3 branch #1949

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.

Sign up for GitHub

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 6 commits into from
Oct 13, 2020
Merged

Resolve conflicts and use forked SourceKit-LSP in 5.3 branch #1949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
703d670
Sync the update checkout config json with main branch
shahmishal Oct 7, 2020
66c1e42
Use forked SwiftWasm SourceKit-LSP
MaxDesiatov Oct 8, 2020
d2c2c9a
Update branches in wasm scheme, add missing s-a-p
MaxDesiatov Oct 8, 2020
2202da5
`cmark` repo should use `main` not `master`
MaxDesiatov Oct 9, 2020
e6e2ad3
[WASM} Install llvm-10 toolchain instead of llvm-6
kateinoigakukun Oct 11, 2020
7daea00
Purge gcc-10 from Ubuntu CI builds
MaxDesiatov Oct 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Free disk space
run: |
df -h
sudo apt-get purge libgcc-9-dev gcc-9 libstdc++-9-dev
sudo apt-get purge libgcc-9-dev gcc-9 libstdc++-9-dev gcc-10 libgcc-10-dev
sudo swapoff -a
sudo rm -f /swapfile
sudo rm -rf /opt/hostedtoolcache
Expand Down Expand Up @@ -69,6 +69,7 @@ jobs:
run: |
df -h
sudo swapoff -a
sudo apt-get purge gcc-10 libgcc-10-dev
sudo rm -f /swapfile
sudo rm -rf /opt/hostedtoolcache
sudo rm -rf /usr/share/dotnet
Expand Down
210 changes: 95 additions & 115 deletions utils/update_checkout/update-checkout-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
"remote": { "id": "apple/swift-cmark" } },
"llbuild": {
"remote": { "id": "apple/swift-llbuild" } },
"swift-argument-parser": {
"remote": { "id": "apple/swift-argument-parser" } },
"swift-driver": {
"remote": { "id": "apple/swift-driver" } },
"swift-tools-support-core": {
"remote": { "id": "apple/swift-tools-support-core" } },
"swiftpm": {
Expand All @@ -31,20 +35,17 @@
"icu": {
"remote": { "id": "unicode-org/icu" }
},
"yams": {
"remote": { "id": "jpsim/Yams" }
},
"cmake": {
"remote": { "id": "KitWare/CMake" },
"platforms": [ "Linux" ]
},
"pythonkit": {
"remote": { "id": "pvieito/PythonKit" }
},
"tensorflow-swift-apis": {
"remote": { "id": "tensorflow/swift-apis" }
},
"indexstore-db": {
"remote": { "id": "apple/indexstore-db" } },
"sourcekit-lsp": {
"remote": { "id": "apple/sourcekit-lsp" } },
"remote": { "id": "swiftwasm/sourcekit-lsp" } },
"swift-format": {
"remote": { "id": "apple/swift-format" } },
"llvm-project": {
Expand All @@ -57,23 +58,24 @@
"repos": {
"llvm-project": "swiftwasm",
"swift": "swiftwasm",
"cmark": "master",
"llbuild": "master",
"swift-tools-support-core": "master",
"cmark": "main",
"llbuild": "main",
"swift-tools-support-core": "main",
"swiftpm": "swiftwasm",
"swift-syntax": "master",
"swift-stress-tester": "master",
"swift-corelibs-xctest": "master",
"swift-corelibs-foundation": "master",
"swift-corelibs-libdispatch": "master",
"swift-integration-tests": "master",
"swift-xcode-playground-support": "master",
"swift-argument-parser": "0.3.0",
"swift-syntax": "main",
"swift-stress-tester": "main",
"swift-corelibs-xctest": "main",
"swift-corelibs-foundation": "main",
"swift-corelibs-libdispatch": "main",
"swift-integration-tests": "main",
"swift-xcode-playground-support": "main",
"ninja": "release",
"icu": "release-65-1",
"cmake": "v3.16.5",
"indexstore-db": "master",
"sourcekit-lsp": "master",
"swift-format": "master"
"indexstore-db": "main",
"sourcekit-lsp": "main",
"swift-format": "main"
}
},
"wasm/5.3": {
Expand All @@ -85,6 +87,7 @@
"llbuild": "release/5.3",
"swift-tools-support-core": "release/5.3",
"swiftpm": "swiftwasm-release/5.3",
"swift-argument-parser": "0.3.0",
"swift-syntax": "release/5.3",
"swift-stress-tester": "release/5.3",
"swift-corelibs-xctest": "swiftwasm-release/5.3",
Expand All @@ -96,62 +99,65 @@
"icu": "release-65-1",
"cmake": "v3.16.5",
"indexstore-db": "release/5.3",
"sourcekit-lsp": "release/5.3",
"sourcekit-lsp": "swiftwasm-release/5.3",
"swift-format": "main"
}
},
"master": {
"aliases": ["master", "swift/master"],
"main": {
"aliases": ["master", "swift/main", "main"],
"repos": {
"llvm-project": "swift/master",
"swift": "master",
"cmark": "master",
"llbuild": "master",
"swift-tools-support-core": "master",
"swiftpm": "master",
"swift-syntax": "master",
"swift-stress-tester": "master",
"swift-corelibs-xctest": "master",
"swift-corelibs-foundation": "master",
"swift-corelibs-libdispatch": "master",
"swift-integration-tests": "master",
"swift-xcode-playground-support": "master",
"llvm-project": "swift/main",
"swift": "main",
"cmark": "main",
"llbuild": "main",
"swift-tools-support-core": "main",
"swiftpm": "main",
"swift-argument-parser": "0.3.0",
"swift-driver": "main",
"swift-syntax": "main",
"swift-stress-tester": "main",
"swift-corelibs-xctest": "main",
"swift-corelibs-foundation": "main",
"swift-corelibs-libdispatch": "main",
"swift-integration-tests": "main",
"swift-xcode-playground-support": "main",
"ninja": "release",
"icu": "release-65-1",
"yams": "3.0.1",
"cmake": "v3.16.5",
"indexstore-db": "master",
"sourcekit-lsp": "master",
"swift-format": "master",
"pythonkit": "master",
"tensorflow-swift-apis": "master"
"indexstore-db": "main",
"sourcekit-lsp": "main",
"swift-format": "main"
}
},
"next" : {
"aliases": ["next", "master-next",
"swift/next",
"stable-next", "upstream",
"next-upstream", "upstream-with-swift"],
"repos": {
"llvm-project": "swift/master-next",
"swift": "master-next",
"cmark": "master",
"llbuild": "master",
"swift-tools-support-core": "master",
"swiftpm": "master",
"swift-syntax": "master",
"swift-stress-tester": "master",
"swift-corelibs-xctest": "master",
"swift-corelibs-foundation": "master",
"swift-corelibs-libdispatch": "master",
"swift-integration-tests": "master",
"swift-xcode-playground-support": "master",
"llvm-project": "swift/next",
"swift": "next",
"cmark": "main",
"llbuild": "main",
"swift-tools-support-core": "main",
"swiftpm": "main",
"swift-argument-parser": "0.3.0",
"swift-driver": "main",
"swift-syntax": "main",
"swift-stress-tester": "main",
"swift-corelibs-xctest": "main",
"swift-corelibs-foundation": "main",
"swift-corelibs-libdispatch": "main",
"swift-integration-tests": "main",
"swift-xcode-playground-support": "main",
"ninja": "release",
"icu": "release-65-1",
"yams": "3.0.1",
"cmake": "v3.16.5",
"indexstore-db": "master",
"sourcekit-lsp": "master",
"swift-format": "master",
"pythonkit": "master",
"tensorflow-swift-apis": "master"
"indexstore-db": "main",
"sourcekit-lsp": "main",
"swift-format": "main"
}
},
"swift-3.0-branch" : {
Expand All @@ -161,17 +167,17 @@
"cmark": "swift-3.0-branch",
"llbuild": "swift-3.0-branch",
"swiftpm": "swift-3.0-branch",
"swift-syntax": "master",
"swift-stress-tester": "master",
"swift-syntax": "main",
"swift-stress-tester": "main",
"swift-corelibs-xctest": "swift-3.0-branch",
"swift-corelibs-foundation": "swift-3.0-branch",
"swift-corelibs-libdispatch": "swift-3.0-branch",
"swift-integration-tests": "swift-3.0-branch",
"swift-xcode-playground-support": "swift-3.0-branch",
"ninja": "release",
"indexstore-db": "master",
"sourcekit-lsp": "master",
"swift-format": "master"
"indexstore-db": "main",
"sourcekit-lsp": "main",
"swift-format": "main"
}
},
"swift-3.1-branch" : {
Expand All @@ -182,17 +188,17 @@
"cmark": "swift-3.1-branch",
"llbuild": "swift-3.1-branch",
"swiftpm": "swift-3.1-branch",
"swift-syntax": "master",
"swift-stress-tester": "master",
"swift-syntax": "main",
"swift-stress-tester": "main",
"swift-corelibs-xctest": "swift-3.1-branch",
"swift-corelibs-foundation": "swift-3.1-branch",
"swift-corelibs-libdispatch": "swift-3.1-branch",
"swift-integration-tests": "swift-3.1-branch",
"swift-xcode-playground-support": "swift-3.1-branch",
"ninja": "release",
"indexstore-db": "master",
"sourcekit-lsp": "master",
"swift-format": "master"
"indexstore-db": "main",
"sourcekit-lsp": "main",
"swift-format": "main"
}
},
"swift-4.0-branch" : {
Expand All @@ -203,17 +209,17 @@
"cmark": "swift-4.0-branch",
"llbuild": "swift-4.0-branch",
"swiftpm": "swift-4.0-branch",
"swift-syntax": "master",
"swift-stress-tester": "master",
"swift-syntax": "main",
"swift-stress-tester": "main",
"swift-corelibs-xctest": "swift-4.0-branch",
"swift-corelibs-foundation": "swift-4.0-branch",
"swift-corelibs-libdispatch": "swift-4.0-branch",
"swift-integration-tests": "swift-4.0-branch",
"swift-xcode-playground-support": "swift-4.0-branch",
"ninja": "release",
"indexstore-db": "master",
"sourcekit-lsp": "master",
"swift-format": "master"
"indexstore-db": "main",
"sourcekit-lsp": "main",
"swift-format": "main"
}
},
"swift-4.1-branch" : {
Expand All @@ -224,17 +230,17 @@
"cmark": "swift-4.1-branch",
"llbuild": "swift-4.1-branch",
"swiftpm": "swift-4.1-branch",
"swift-syntax": "master",
"swift-stress-tester": "master",
"swift-syntax": "main",
"swift-stress-tester": "main",
"swift-corelibs-xctest": "swift-4.1-branch",
"swift-corelibs-foundation": "swift-4.1-branch",
"swift-corelibs-libdispatch": "swift-4.1-branch",
"swift-integration-tests": "swift-4.1-branch",
"swift-xcode-playground-support": "swift-4.1-branch",
"ninja": "release",
"indexstore-db": "master",
"sourcekit-lsp": "master",
"swift-format": "master"
"indexstore-db": "main",
"sourcekit-lsp": "main",
"swift-format": "main"
}
},
"swift-4.2-branch" : {
Expand All @@ -246,16 +252,16 @@
"llbuild": "swift-4.2-branch",
"swiftpm": "swift-4.2-branch",
"swift-syntax": "swift-4.2-branch",
"swift-stress-tester": "master",
"swift-stress-tester": "main",
"swift-corelibs-xctest": "swift-4.2-branch",
"swift-corelibs-foundation": "swift-4.2-branch",
"swift-corelibs-libdispatch": "swift-4.2-branch",
"swift-integration-tests": "swift-4.2-branch",
"swift-xcode-playground-support": "swift-4.2-branch",
"ninja": "release",
"indexstore-db": "master",
"sourcekit-lsp": "master",
"swift-format": "master"
"indexstore-db": "main",
"sourcekit-lsp": "main",
"swift-format": "main"
}
},
"swift-5.0-branch" : {
Expand All @@ -275,9 +281,9 @@
"swift-xcode-playground-support": "swift-5.0-branch",
"ninja": "release",
"icu": "release-61-1",
"indexstore-db": "master",
"sourcekit-lsp": "master",
"swift-format": "master"
"indexstore-db": "main",
"sourcekit-lsp": "main",
"swift-format": "main"
}
},
"swift-5.1-branch" : {
Expand All @@ -299,7 +305,7 @@
"icu": "release-61-1",
"indexstore-db": "swift-5.1-branch",
"sourcekit-lsp": "swift-5.1-branch",
"swift-format": "master"
"swift-format": "main"
}
},
"swift-5.2-branch": {
Expand All @@ -323,7 +329,7 @@
"cmake": "v3.15.1",
"indexstore-db": "swift-5.2-branch",
"sourcekit-lsp": "swift-5.2-branch",
"swift-format": "master"
"swift-format": "main"
}
},
"release/5.3": {
Expand All @@ -347,33 +353,7 @@
"cmake": "v3.16.5",
"indexstore-db": "release/5.3",
"sourcekit-lsp": "release/5.3",
"swift-format": "master",
"pythonkit": "master",
"tensorflow-swift-apis": "master"
}
},
"master-rebranch": {
"aliases": ["master-rebranch", "swift/master-rebranch"],
"repos": {
"llvm-project": "swift/master-rebranch",
"swift": "master-rebranch",
"cmark": "master",
"llbuild": "master",
"swift-tools-support-core": "master",
"swiftpm": "master",
"swift-syntax": "master",
"swift-stress-tester": "master",
"swift-corelibs-xctest": "master",
"swift-corelibs-foundation": "master",
"swift-corelibs-libdispatch": "master",
"swift-integration-tests": "master",
"swift-xcode-playground-support": "master",
"ninja": "release",
"icu": "release-65-1",
"cmake": "v3.16.5",
"indexstore-db": "master",
"sourcekit-lsp": "master",
"swift-format": "master"
"swift-format": "main"
}
}
}
Expand Down
6 changes: 4 additions & 2 deletions utils/webassembly/linux/install-dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@ sudo apt update

if [ $(grep RELEASE /etc/lsb-release) == "DISTRIB_RELEASE=18.04" ]; then
sudo apt install -y \
git ninja-build clang python python-six \
git ninja-build clang-10 python python-six \
uuid-dev libicu-dev icu-devtools libbsd-dev \
libedit-dev libxml2-dev libsqlite3-dev swig \
libpython-dev libncurses5-dev pkg-config \
libblocksruntime-dev libcurl4-openssl-dev \
systemtap-sdt-dev tzdata rsync wget llvm zip unzip
systemtap-sdt-dev tzdata rsync wget llvm-10 zip unzip
sudo ln -s -f /usr/bin/clang-10 /usr/bin/clang
sudo ln -s -f /usr/bin/clang++-10 /usr/bin/clang++
elif [ $(grep RELEASE /etc/lsb-release) == "DISTRIB_RELEASE=20.04" ]; then
sudo apt install -y \
git ninja-build clang python python-six \
Expand Down