Skip to content

Commit 98c01ef

Browse files
MaxDesiatovMaxDesiatov
authored
Merge pull request #1949 from swiftwasm/swiftwasm-release/5.3-sourcekit-lsp
Resolve conflicts and use forked SourceKit-LSP in 5.3 branch
2 parents 3f28264 + 7daea00 commit 98c01ef

File tree

3 files changed

+101
-118
lines changed

3 files changed

+101
-118
lines changed

‎.github/workflows/main.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Free disk space
2020
run: |
2121
df -h
22-
sudo apt-get purge libgcc-9-dev gcc-9 libstdc++-9-dev
22+
sudo apt-get purge libgcc-9-dev gcc-9 libstdc++-9-dev gcc-10 libgcc-10-dev
2323
sudo swapoff -a
2424
sudo rm -f /swapfile
2525
sudo rm -rf /opt/hostedtoolcache
@@ -69,6 +69,7 @@ jobs:
6969
run: |
7070
df -h
7171
sudo swapoff -a
72+
sudo apt-get purge gcc-10 libgcc-10-dev
7273
sudo rm -f /swapfile
7374
sudo rm -rf /opt/hostedtoolcache
7475
sudo rm -rf /usr/share/dotnet

‎utils/update_checkout/update-checkout-config.json

Lines changed: 95 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
"remote": { "id": "apple/swift-cmark" } },
99
"llbuild": {
1010
"remote": { "id": "apple/swift-llbuild" } },
11+
"swift-argument-parser": {
12+
"remote": { "id": "apple/swift-argument-parser" } },
13+
"swift-driver": {
14+
"remote": { "id": "apple/swift-driver" } },
1115
"swift-tools-support-core": {
1216
"remote": { "id": "apple/swift-tools-support-core" } },
1317
"swiftpm": {
@@ -31,20 +35,17 @@
3135
"icu": {
3236
"remote": { "id": "unicode-org/icu" }
3337
},
38+
"yams": {
39+
"remote": { "id": "jpsim/Yams" }
40+
},
3441
"cmake": {
3542
"remote": { "id": "KitWare/CMake" },
3643
"platforms": [ "Linux" ]
3744
},
38-
"pythonkit": {
39-
"remote": { "id": "pvieito/PythonKit" }
40-
},
41-
"tensorflow-swift-apis": {
42-
"remote": { "id": "tensorflow/swift-apis" }
43-
},
4445
"indexstore-db": {
4546
"remote": { "id": "apple/indexstore-db" } },
4647
"sourcekit-lsp": {
47-
"remote": { "id": "apple/sourcekit-lsp" } },
48+
"remote": { "id": "swiftwasm/sourcekit-lsp" } },
4849
"swift-format": {
4950
"remote": { "id": "apple/swift-format" } },
5051
"llvm-project": {
@@ -57,23 +58,24 @@
5758
"repos": {
5859
"llvm-project": "swiftwasm",
5960
"swift": "swiftwasm",
60-
"cmark": "master",
61-
"llbuild": "master",
62-
"swift-tools-support-core": "master",
61+
"cmark": "main",
62+
"llbuild": "main",
63+
"swift-tools-support-core": "main",
6364
"swiftpm": "swiftwasm",
64-
"swift-syntax": "master",
65-
"swift-stress-tester": "master",
66-
"swift-corelibs-xctest": "master",
67-
"swift-corelibs-foundation": "master",
68-
"swift-corelibs-libdispatch": "master",
69-
"swift-integration-tests": "master",
70-
"swift-xcode-playground-support": "master",
65+
"swift-argument-parser": "0.3.0",
66+
"swift-syntax": "main",
67+
"swift-stress-tester": "main",
68+
"swift-corelibs-xctest": "main",
69+
"swift-corelibs-foundation": "main",
70+
"swift-corelibs-libdispatch": "main",
71+
"swift-integration-tests": "main",
72+
"swift-xcode-playground-support": "main",
7173
"ninja": "release",
7274
"icu": "release-65-1",
7375
"cmake": "v3.16.5",
74-
"indexstore-db": "master",
75-
"sourcekit-lsp": "master",
76-
"swift-format": "master"
76+
"indexstore-db": "main",
77+
"sourcekit-lsp": "main",
78+
"swift-format": "main"
7779
}
7880
},
7981
"wasm/5.3": {
@@ -85,6 +87,7 @@
8587
"llbuild": "release/5.3",
8688
"swift-tools-support-core": "release/5.3",
8789
"swiftpm": "swiftwasm-release/5.3",
90+
"swift-argument-parser": "0.3.0",
8891
"swift-syntax": "release/5.3",
8992
"swift-stress-tester": "release/5.3",
9093
"swift-corelibs-xctest": "swiftwasm-release/5.3",
@@ -96,62 +99,65 @@
9699
"icu": "release-65-1",
97100
"cmake": "v3.16.5",
98101
"indexstore-db": "release/5.3",
99-
"sourcekit-lsp": "release/5.3",
102+
"sourcekit-lsp": "swiftwasm-release/5.3",
100103
"swift-format": "main"
101104
}
102105
},
103-
"master": {
104-
"aliases": ["master", "swift/master"],
106+
"main": {
107+
"aliases": ["master", "swift/main", "main"],
105108
"repos": {
106-
"llvm-project": "swift/master",
107-
"swift": "master",
108-
"cmark": "master",
109-
"llbuild": "master",
110-
"swift-tools-support-core": "master",
111-
"swiftpm": "master",
112-
"swift-syntax": "master",
113-
"swift-stress-tester": "master",
114-
"swift-corelibs-xctest": "master",
115-
"swift-corelibs-foundation": "master",
116-
"swift-corelibs-libdispatch": "master",
117-
"swift-integration-tests": "master",
118-
"swift-xcode-playground-support": "master",
109+
"llvm-project": "swift/main",
110+
"swift": "main",
111+
"cmark": "main",
112+
"llbuild": "main",
113+
"swift-tools-support-core": "main",
114+
"swiftpm": "main",
115+
"swift-argument-parser": "0.3.0",
116+
"swift-driver": "main",
117+
"swift-syntax": "main",
118+
"swift-stress-tester": "main",
119+
"swift-corelibs-xctest": "main",
120+
"swift-corelibs-foundation": "main",
121+
"swift-corelibs-libdispatch": "main",
122+
"swift-integration-tests": "main",
123+
"swift-xcode-playground-support": "main",
119124
"ninja": "release",
120125
"icu": "release-65-1",
126+
"yams": "3.0.1",
121127
"cmake": "v3.16.5",
122-
"indexstore-db": "master",
123-
"sourcekit-lsp": "master",
124-
"swift-format": "master",
125-
"pythonkit": "master",
126-
"tensorflow-swift-apis": "master"
128+
"indexstore-db": "main",
129+
"sourcekit-lsp": "main",
130+
"swift-format": "main"
127131
}
128132
},
129133
"next" : {
130134
"aliases": ["next", "master-next",
135+
"swift/next",
131136
"stable-next", "upstream",
132137
"next-upstream", "upstream-with-swift"],
133138
"repos": {
134-
"llvm-project": "swift/master-next",
135-
"swift": "master-next",
136-
"cmark": "master",
137-
"llbuild": "master",
138-
"swift-tools-support-core": "master",
139-
"swiftpm": "master",
140-
"swift-syntax": "master",
141-
"swift-stress-tester": "master",
142-
"swift-corelibs-xctest": "master",
143-
"swift-corelibs-foundation": "master",
144-
"swift-corelibs-libdispatch": "master",
145-
"swift-integration-tests": "master",
146-
"swift-xcode-playground-support": "master",
139+
"llvm-project": "swift/next",
140+
"swift": "next",
141+
"cmark": "main",
142+
"llbuild": "main",
143+
"swift-tools-support-core": "main",
144+
"swiftpm": "main",
145+
"swift-argument-parser": "0.3.0",
146+
"swift-driver": "main",
147+
"swift-syntax": "main",
148+
"swift-stress-tester": "main",
149+
"swift-corelibs-xctest": "main",
150+
"swift-corelibs-foundation": "main",
151+
"swift-corelibs-libdispatch": "main",
152+
"swift-integration-tests": "main",
153+
"swift-xcode-playground-support": "main",
147154
"ninja": "release",
148155
"icu": "release-65-1",
156+
"yams": "3.0.1",
149157
"cmake": "v3.16.5",
150-
"indexstore-db": "master",
151-
"sourcekit-lsp": "master",
152-
"swift-format": "master",
153-
"pythonkit": "master",
154-
"tensorflow-swift-apis": "master"
158+
"indexstore-db": "main",
159+
"sourcekit-lsp": "main",
160+
"swift-format": "main"
155161
}
156162
},
157163
"swift-3.0-branch" : {
@@ -161,17 +167,17 @@
161167
"cmark": "swift-3.0-branch",
162168
"llbuild": "swift-3.0-branch",
163169
"swiftpm": "swift-3.0-branch",
164-
"swift-syntax": "master",
165-
"swift-stress-tester": "master",
170+
"swift-syntax": "main",
171+
"swift-stress-tester": "main",
166172
"swift-corelibs-xctest": "swift-3.0-branch",
167173
"swift-corelibs-foundation": "swift-3.0-branch",
168174
"swift-corelibs-libdispatch": "swift-3.0-branch",
169175
"swift-integration-tests": "swift-3.0-branch",
170176
"swift-xcode-playground-support": "swift-3.0-branch",
171177
"ninja": "release",
172-
"indexstore-db": "master",
173-
"sourcekit-lsp": "master",
174-
"swift-format": "master"
178+
"indexstore-db": "main",
179+
"sourcekit-lsp": "main",
180+
"swift-format": "main"
175181
}
176182
},
177183
"swift-3.1-branch" : {
@@ -182,17 +188,17 @@
182188
"cmark": "swift-3.1-branch",
183189
"llbuild": "swift-3.1-branch",
184190
"swiftpm": "swift-3.1-branch",
185-
"swift-syntax": "master",
186-
"swift-stress-tester": "master",
191+
"swift-syntax": "main",
192+
"swift-stress-tester": "main",
187193
"swift-corelibs-xctest": "swift-3.1-branch",
188194
"swift-corelibs-foundation": "swift-3.1-branch",
189195
"swift-corelibs-libdispatch": "swift-3.1-branch",
190196
"swift-integration-tests": "swift-3.1-branch",
191197
"swift-xcode-playground-support": "swift-3.1-branch",
192198
"ninja": "release",
193-
"indexstore-db": "master",
194-
"sourcekit-lsp": "master",
195-
"swift-format": "master"
199+
"indexstore-db": "main",
200+
"sourcekit-lsp": "main",
201+
"swift-format": "main"
196202
}
197203
},
198204
"swift-4.0-branch" : {
@@ -203,17 +209,17 @@
203209
"cmark": "swift-4.0-branch",
204210
"llbuild": "swift-4.0-branch",
205211
"swiftpm": "swift-4.0-branch",
206-
"swift-syntax": "master",
207-
"swift-stress-tester": "master",
212+
"swift-syntax": "main",
213+
"swift-stress-tester": "main",
208214
"swift-corelibs-xctest": "swift-4.0-branch",
209215
"swift-corelibs-foundation": "swift-4.0-branch",
210216
"swift-corelibs-libdispatch": "swift-4.0-branch",
211217
"swift-integration-tests": "swift-4.0-branch",
212218
"swift-xcode-playground-support": "swift-4.0-branch",
213219
"ninja": "release",
214-
"indexstore-db": "master",
215-
"sourcekit-lsp": "master",
216-
"swift-format": "master"
220+
"indexstore-db": "main",
221+
"sourcekit-lsp": "main",
222+
"swift-format": "main"
217223
}
218224
},
219225
"swift-4.1-branch" : {
@@ -224,17 +230,17 @@
224230
"cmark": "swift-4.1-branch",
225231
"llbuild": "swift-4.1-branch",
226232
"swiftpm": "swift-4.1-branch",
227-
"swift-syntax": "master",
228-
"swift-stress-tester": "master",
233+
"swift-syntax": "main",
234+
"swift-stress-tester": "main",
229235
"swift-corelibs-xctest": "swift-4.1-branch",
230236
"swift-corelibs-foundation": "swift-4.1-branch",
231237
"swift-corelibs-libdispatch": "swift-4.1-branch",
232238
"swift-integration-tests": "swift-4.1-branch",
233239
"swift-xcode-playground-support": "swift-4.1-branch",
234240
"ninja": "release",
235-
"indexstore-db": "master",
236-
"sourcekit-lsp": "master",
237-
"swift-format": "master"
241+
"indexstore-db": "main",
242+
"sourcekit-lsp": "main",
243+
"swift-format": "main"
238244
}
239245
},
240246
"swift-4.2-branch" : {
@@ -246,16 +252,16 @@
246252
"llbuild": "swift-4.2-branch",
247253
"swiftpm": "swift-4.2-branch",
248254
"swift-syntax": "swift-4.2-branch",
249-
"swift-stress-tester": "master",
255+
"swift-stress-tester": "main",
250256
"swift-corelibs-xctest": "swift-4.2-branch",
251257
"swift-corelibs-foundation": "swift-4.2-branch",
252258
"swift-corelibs-libdispatch": "swift-4.2-branch",
253259
"swift-integration-tests": "swift-4.2-branch",
254260
"swift-xcode-playground-support": "swift-4.2-branch",
255261
"ninja": "release",
256-
"indexstore-db": "master",
257-
"sourcekit-lsp": "master",
258-
"swift-format": "master"
262+
"indexstore-db": "main",
263+
"sourcekit-lsp": "main",
264+
"swift-format": "main"
259265
}
260266
},
261267
"swift-5.0-branch" : {
@@ -275,9 +281,9 @@
275281
"swift-xcode-playground-support": "swift-5.0-branch",
276282
"ninja": "release",
277283
"icu": "release-61-1",
278-
"indexstore-db": "master",
279-
"sourcekit-lsp": "master",
280-
"swift-format": "master"
284+
"indexstore-db": "main",
285+
"sourcekit-lsp": "main",
286+
"swift-format": "main"
281287
}
282288
},
283289
"swift-5.1-branch" : {
@@ -299,7 +305,7 @@
299305
"icu": "release-61-1",
300306
"indexstore-db": "swift-5.1-branch",
301307
"sourcekit-lsp": "swift-5.1-branch",
302-
"swift-format": "master"
308+
"swift-format": "main"
303309
}
304310
},
305311
"swift-5.2-branch": {
@@ -323,7 +329,7 @@
323329
"cmake": "v3.15.1",
324330
"indexstore-db": "swift-5.2-branch",
325331
"sourcekit-lsp": "swift-5.2-branch",
326-
"swift-format": "master"
332+
"swift-format": "main"
327333
}
328334
},
329335
"release/5.3": {
@@ -347,33 +353,7 @@
347353
"cmake": "v3.16.5",
348354
"indexstore-db": "release/5.3",
349355
"sourcekit-lsp": "release/5.3",
350-
"swift-format": "master",
351-
"pythonkit": "master",
352-
"tensorflow-swift-apis": "master"
353-
}
354-
},
355-
"master-rebranch": {
356-
"aliases": ["master-rebranch", "swift/master-rebranch"],
357-
"repos": {
358-
"llvm-project": "swift/master-rebranch",
359-
"swift": "master-rebranch",
360-
"cmark": "master",
361-
"llbuild": "master",
362-
"swift-tools-support-core": "master",
363-
"swiftpm": "master",
364-
"swift-syntax": "master",
365-
"swift-stress-tester": "master",
366-
"swift-corelibs-xctest": "master",
367-
"swift-corelibs-foundation": "master",
368-
"swift-corelibs-libdispatch": "master",
369-
"swift-integration-tests": "master",
370-
"swift-xcode-playground-support": "master",
371-
"ninja": "release",
372-
"icu": "release-65-1",
373-
"cmake": "v3.16.5",
374-
"indexstore-db": "master",
375-
"sourcekit-lsp": "master",
376-
"swift-format": "master"
356+
"swift-format": "main"
377357
}
378358
}
379359
}

‎utils/webassembly/linux/install-dependencies.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@ sudo apt update
66

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

0 commit comments

Comments
 (0)