Skip to content

Commit 270e806

Browse files
shahmishalshahmishal
authored
Merge pull request #27765 from apple/5.1-monorepo-update
[5.1] [LLVM Project] Update the update-checkout config to support
2 parents 6d433ae + 09f4d04 commit 270e806

File tree

2 files changed

+44
-144
lines changed

2 files changed

+44
-144
lines changed

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

Lines changed: 28 additions & 144 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,9 @@
22
"ssh-clone-pattern": "[email protected]:%s.git",
33
"https-clone-pattern": "https://github.com/%s.git",
44
"repos" : {
5-
"llvm": {
6-
"remote": { "id": "apple/swift-llvm" } },
7-
"clang": {
8-
"remote": { "id": "apple/swift-clang" } },
9-
"swift": {
5+
"swift": {
106
"remote": { "id": "apple/swift" } },
11-
"lldb": {
12-
"remote": { "id": "apple/swift-lldb" } },
13-
"cmark": {
7+
"cmark": {
148
"remote": { "id": "apple/swift-cmark" } },
159
"llbuild": {
1610
"remote": { "id": "apple/swift-llbuild" } },
@@ -20,8 +14,6 @@
2014
"remote": { "id": "apple/swift-syntax" } },
2115
"swift-stress-tester": {
2216
"remote": { "id": "apple/swift-stress-tester" } },
23-
"compiler-rt": {
24-
"remote": { "id": "apple/swift-compiler-rt" } },
2517
"swift-corelibs-xctest": {
2618
"remote": { "id": "apple/swift-corelibs-xctest" } },
2719
"swift-corelibs-foundation": {
@@ -38,39 +30,39 @@
3830
"remote": { "id": "unicode-org/icu" },
3931
"platforms": [ "Linux" ]
4032
},
41-
"libcxx": {
42-
"remote": { "id": "apple/swift-libcxx" } },
43-
"clang-tools-extra": {
44-
"remote": { "id": "apple/swift-clang-tools-extra" } },
45-
"indexstore-db": {
33+
"cmake": {
34+
"remote": { "id": "KitWare/CMake" },
35+
"platforms": [ "Linux" ]
36+
},
37+
"indexstore-db": {
4638
"remote": { "id": "apple/indexstore-db" } },
4739
"sourcekit-lsp": {
48-
"remote": { "id": "apple/sourcekit-lsp" } }
40+
"remote": { "id": "apple/sourcekit-lsp" } },
41+
"swift-format": {
42+
"remote": { "id": "apple/swift-format" } },
43+
"llvm-project": {
44+
"remote": { "id": "apple/llvm-project" } }
4945
},
5046
"default-branch-scheme": "master",
5147
"branch-schemes": {
52-
"master": {
53-
"aliases": ["master", "stable"],
48+
"master": {
49+
"aliases": ["master", "swift/master"],
5450
"repos": {
55-
"llvm": "stable",
56-
"clang": "stable",
51+
"llvm-project": "swift/master",
5752
"swift": "master",
58-
"lldb": "stable",
5953
"cmark": "master",
6054
"llbuild": "master",
6155
"swiftpm": "master",
6256
"swift-syntax": "master",
6357
"swift-stress-tester": "master",
64-
"compiler-rt": "stable",
6558
"swift-corelibs-xctest": "master",
6659
"swift-corelibs-foundation": "master",
6760
"swift-corelibs-libdispatch": "master",
6861
"swift-integration-tests": "master",
6962
"swift-xcode-playground-support": "master",
7063
"ninja": "release",
7164
"icu": "release-61-1",
72-
"clang-tools-extra": "stable",
73-
"libcxx": "stable",
65+
"cmake": "v3.15.1",
7466
"indexstore-db": "master",
7567
"sourcekit-lsp": "master"
7668
}
@@ -80,11 +72,8 @@
8072
"stable-next", "upstream",
8173
"next-upstream", "upstream-with-swift"],
8274
"repos": {
83-
"llvm": "upstream-with-swift",
84-
"clang": "upstream-with-swift",
85-
"compiler-rt": "upstream-with-swift",
75+
"llvm-project": "swift/master-next",
8676
"swift": "master-next",
87-
"lldb": "upstream-with-swift",
8877
"cmark": "master",
8978
"llbuild": "master",
9079
"swiftpm": "master",
@@ -97,25 +86,20 @@
9786
"swift-xcode-playground-support": "master",
9887
"ninja": "release",
9988
"icu": "release-61-1",
100-
"clang-tools-extra": "upstream-with-swift",
101-
"libcxx": "upstream-with-swift",
89+
"cmake": "v3.15.1",
10290
"indexstore-db": "master",
10391
"sourcekit-lsp": "master"
10492
}
10593
},
106-
"swift-3.0-branch" : {
94+
"swift-3.0-branch" : {
10795
"aliases": ["swift-3.0-branch"],
10896
"repos": {
109-
"llvm": "swift-3.0-branch",
110-
"clang": "swift-3.0-branch",
111-
"swift": "swift-3.0-branch",
112-
"lldb": "swift-3.0-branch",
97+
"llvm-project": "swift/swift-3.0-branch",
11398
"cmark": "swift-3.0-branch",
11499
"llbuild": "swift-3.0-branch",
115100
"swiftpm": "swift-3.0-branch",
116101
"swift-syntax": "master",
117102
"swift-stress-tester": "master",
118-
"compiler-rt": "swift-3.0-branch",
119103
"swift-corelibs-xctest": "swift-3.0-branch",
120104
"swift-corelibs-foundation": "swift-3.0-branch",
121105
"swift-corelibs-libdispatch": "swift-3.0-branch",
@@ -129,16 +113,13 @@
129113
"swift-3.1-branch" : {
130114
"aliases": ["swift-3.1-branch"],
131115
"repos": {
132-
"llvm": "swift-3.1-branch",
133-
"clang": "swift-3.1-branch",
116+
"llvm-project": "swift/swift-3.1-branch",
134117
"swift": "swift-3.1-branch",
135-
"lldb": "swift-3.1-branch",
136118
"cmark": "swift-3.1-branch",
137119
"llbuild": "swift-3.1-branch",
138120
"swiftpm": "swift-3.1-branch",
139121
"swift-syntax": "master",
140122
"swift-stress-tester": "master",
141-
"compiler-rt": "swift-3.1-branch",
142123
"swift-corelibs-xctest": "swift-3.1-branch",
143124
"swift-corelibs-foundation": "swift-3.1-branch",
144125
"swift-corelibs-libdispatch": "swift-3.1-branch",
@@ -152,16 +133,13 @@
152133
"swift-4.0-branch" : {
153134
"aliases": ["swift-4.0-branch"],
154135
"repos": {
155-
"llvm": "swift-4.0-branch",
156-
"clang": "swift-4.0-branch",
136+
"llvm-project": "swift/swift-4.0-branch",
157137
"swift": "swift-4.0-branch",
158-
"lldb": "swift-4.0-branch",
159138
"cmark": "swift-4.0-branch",
160139
"llbuild": "swift-4.0-branch",
161140
"swiftpm": "swift-4.0-branch",
162141
"swift-syntax": "master",
163142
"swift-stress-tester": "master",
164-
"compiler-rt": "swift-4.0-branch",
165143
"swift-corelibs-xctest": "swift-4.0-branch",
166144
"swift-corelibs-foundation": "swift-4.0-branch",
167145
"swift-corelibs-libdispatch": "swift-4.0-branch",
@@ -175,16 +153,13 @@
175153
"swift-4.1-branch" : {
176154
"aliases": ["swift-4.1-branch"],
177155
"repos": {
178-
"llvm": "swift-4.1-branch",
179-
"clang": "swift-4.1-branch",
156+
"llvm-project": "swift/swift-4.1-branch",
180157
"swift": "swift-4.1-branch",
181-
"lldb": "swift-4.1-branch",
182158
"cmark": "swift-4.1-branch",
183159
"llbuild": "swift-4.1-branch",
184160
"swiftpm": "swift-4.1-branch",
185161
"swift-syntax": "master",
186162
"swift-stress-tester": "master",
187-
"compiler-rt": "swift-4.1-branch",
188163
"swift-corelibs-xctest": "swift-4.1-branch",
189164
"swift-corelibs-foundation": "swift-4.1-branch",
190165
"swift-corelibs-libdispatch": "swift-4.1-branch",
@@ -198,16 +173,13 @@
198173
"swift-4.2-branch" : {
199174
"aliases": ["swift-4.2-branch"],
200175
"repos": {
201-
"llvm": "swift-4.2-branch",
202-
"clang": "swift-4.2-branch",
176+
"llvm-project": "swift/swift-4.2-branch",
203177
"swift": "swift-4.2-branch",
204-
"lldb": "swift-4.2-branch",
205178
"cmark": "swift-4.2-branch",
206179
"llbuild": "swift-4.2-branch",
207180
"swiftpm": "swift-4.2-branch",
208181
"swift-syntax": "swift-4.2-branch",
209182
"swift-stress-tester": "master",
210-
"compiler-rt": "swift-4.2-branch",
211183
"swift-corelibs-xctest": "swift-4.2-branch",
212184
"swift-corelibs-foundation": "swift-4.2-branch",
213185
"swift-corelibs-libdispatch": "swift-4.2-branch",
@@ -221,11 +193,8 @@
221193
"swift-5.0-branch" : {
222194
"aliases": ["swift-5.0-branch"],
223195
"repos": {
224-
"llvm": "swift-5.0-branch",
225-
"clang": "swift-5.0-branch",
226-
"compiler-rt": "swift-5.0-branch",
196+
"llvm-project": "swift/swift-5.0-branch",
227197
"swift": "swift-5.0-branch",
228-
"lldb": "swift-5.0-branch",
229198
"cmark": "swift-5.0-branch",
230199
"llbuild": "swift-5.0-branch",
231200
"swiftpm": "swift-5.0-branch",
@@ -238,98 +207,15 @@
238207
"swift-xcode-playground-support": "swift-5.0-branch",
239208
"ninja": "release",
240209
"icu": "release-61-1",
241-
"clang-tools-extra": "swift-5.0-branch",
242-
"libcxx": "swift-5.0-branch",
243-
"indexstore-db": "master",
244-
"sourcekit-lsp": "master"
245-
}
246-
},
247-
"swift-5.1-old-llvm-branch" : {
248-
"aliases": ["swift-5.1-old-llvm-branch"],
249-
"repos": {
250-
"llvm": "swift-5.0-branch",
251-
"clang": "swift-5.0-branch",
252-
"compiler-rt": "swift-5.0-branch",
253-
"swift": "swift-5.1-old-llvm-branch",
254-
"lldb": "stable",
255-
"cmark": "master",
256-
"llbuild": "master",
257-
"swiftpm": "master",
258-
"swift-syntax": "master",
259-
"swift-stress-tester": "master",
260-
"swift-corelibs-xctest": "master",
261-
"swift-corelibs-foundation": "master",
262-
"swift-corelibs-libdispatch": "master",
263-
"swift-integration-tests": "master",
264-
"swift-xcode-playground-support": "master",
265-
"ninja": "release",
266-
"icu": "release-61-1",
267-
"clang-tools-extra": "swift-5.0-branch",
268-
"libcxx": "swift-5.0-branch",
269210
"indexstore-db": "master",
270211
"sourcekit-lsp": "master"
271212
}
272213
},
273-
"swift-5.1-branch" : {
274-
"aliases": ["swift-5.1-branch"],
214+
"swift-5.1-branch" : {
215+
"aliases": ["swift-5.1-branch", "swift/swift-5.1-branch"],
275216
"repos": {
276-
"llvm": "swift-5.1-branch",
277-
"clang": "swift-5.1-branch",
278-
"compiler-rt": "swift-5.1-branch",
217+
"llvm-project": "swift/swift-5.1-branch",
279218
"swift": "swift-5.1-branch",
280-
"lldb": "swift-5.1-branch",
281-
"cmark": "master",
282-
"llbuild": "swift-5.1-branch",
283-
"swiftpm": "swift-5.1-branch",
284-
"swift-syntax": "swift-5.1-branch",
285-
"swift-stress-tester": "swift-5.1-branch",
286-
"swift-corelibs-xctest": "swift-5.1-branch",
287-
"swift-corelibs-foundation": "swift-5.1-branch",
288-
"swift-corelibs-libdispatch": "swift-5.1-branch",
289-
"swift-integration-tests": "swift-5.1-branch",
290-
"swift-xcode-playground-support": "swift-5.1-branch",
291-
"ninja": "release",
292-
"icu": "release-61-1",
293-
"clang-tools-extra": "swift-5.1-branch",
294-
"libcxx": "swift-5.1-branch",
295-
"indexstore-db": "swift-5.1-branch",
296-
"sourcekit-lsp": "swift-5.1-branch"
297-
}
298-
},
299-
"swift-5.1-branch-04-24-2019" : {
300-
"aliases": ["swift-5.1-branch-04-24-2019"],
301-
"repos": {
302-
"llvm": "swift-5.1-branch",
303-
"clang": "swift-5.1-branch",
304-
"compiler-rt": "swift-5.1-branch",
305-
"swift": "swift-5.1-branch-04-24-2019",
306-
"lldb": "swift-5.1-branch",
307-
"cmark": "master",
308-
"llbuild": "swift-5.1-branch",
309-
"swiftpm": "swift-5.1-branch",
310-
"swift-syntax": "swift-5.1-branch-04-24-2019",
311-
"swift-stress-tester": "swift-5.1-branch",
312-
"swift-corelibs-xctest": "swift-5.1-branch",
313-
"swift-corelibs-foundation": "swift-5.1-branch",
314-
"swift-corelibs-libdispatch": "swift-5.1-branch",
315-
"swift-integration-tests": "swift-5.1-branch",
316-
"swift-xcode-playground-support": "swift-5.1-branch",
317-
"ninja": "release",
318-
"icu": "release-61-1",
319-
"clang-tools-extra": "swift-5.1-branch",
320-
"libcxx": "swift-5.1-branch",
321-
"indexstore-db": "swift-5.1-branch",
322-
"sourcekit-lsp": "swift-5.1-branch"
323-
}
324-
},
325-
"swift-5.1-branch-06-12-2019" : {
326-
"aliases": ["swift-5.1-branch-06-12-2019"],
327-
"repos": {
328-
"llvm": "swift-5.1-branch",
329-
"clang": "swift-5.1-branch",
330-
"compiler-rt": "swift-5.1-branch",
331-
"swift": "swift-5.1-branch-06-12-2019",
332-
"lldb": "swift-5.1-branch",
333219
"cmark": "master",
334220
"llbuild": "swift-5.1-branch",
335221
"swiftpm": "swift-5.1-branch",
@@ -342,8 +228,6 @@
342228
"swift-xcode-playground-support": "swift-5.1-branch",
343229
"ninja": "release",
344230
"icu": "release-61-1",
345-
"clang-tools-extra": "swift-5.1-branch",
346-
"libcxx": "swift-5.1-branch",
347231
"indexstore-db": "swift-5.1-branch",
348232
"sourcekit-lsp": "swift-5.1-branch"
349233
}

‎utils/update_checkout/update_checkout/update_checkout.py

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -406,6 +406,21 @@ def skip_list_for_platform(config):
406406

407407
return skip_list
408408

409+
def symlink_llvm_monorepo(args):
410+
print("Create symlink for LLVM Project")
411+
llvm_projects = ['clang',
412+
'llvm',
413+
'lldb',
414+
'compiler-rt',
415+
'libcxx',
416+
'clang-tools-extra']
417+
for project in llvm_projects:
418+
src_path = os.path.join(SWIFT_SOURCE_ROOT,
419+
'llvm-project',
420+
project)
421+
dst_path = os.path.join(SWIFT_SOURCE_ROOT, project)
422+
if not os.path.islink(dst_path):
423+
os.symlink(src_path, dst_path)
409424

410425
def main():
411426
freeze_support()
@@ -554,5 +569,6 @@ def main():
554569
if fail_count > 0:
555570
print("update-checkout failed, fix errors and try again")
556571
else:
572+
symlink_llvm_monorepo(args)
557573
print("update-checkout succeeded")
558574
sys.exit(fail_count)

0 commit comments

Comments
 (0)