Skip to content

Commit 403af12

Browse files
shahmishalshahmishal
authored
Merge pull request #27763 from apple/master-monorepo-update-v2
[LLVM Project] Update the update-checkout config to support
2 parents 42e07aa + bdf8cf7 commit 403af12

File tree

2 files changed

+17
-250
lines changed

2 files changed

+17
-250
lines changed

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

Lines changed: 16 additions & 244 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": {
@@ -42,51 +34,19 @@
4234
"remote": { "id": "KitWare/CMake" },
4335
"platforms": [ "Linux" ]
4436
},
45-
"libcxx": {
46-
"remote": { "id": "apple/swift-libcxx" } },
47-
"clang-tools-extra": {
48-
"remote": { "id": "apple/swift-clang-tools-extra" } },
49-
"indexstore-db": {
37+
"indexstore-db": {
5038
"remote": { "id": "apple/indexstore-db" } },
5139
"sourcekit-lsp": {
5240
"remote": { "id": "apple/sourcekit-lsp" } },
5341
"swift-format": {
5442
"remote": { "id": "apple/swift-format" } },
5543
"llvm-project": {
56-
"remote": { "id": "apple/llvm-project-v3" } }
44+
"remote": { "id": "apple/llvm-project" } }
5745
},
5846
"default-branch-scheme": "master",
5947
"branch-schemes": {
60-
"master": {
61-
"aliases": ["master", "stable"],
62-
"repos": {
63-
"llvm": "stable",
64-
"clang": "stable",
65-
"swift": "master",
66-
"lldb": "stable",
67-
"cmark": "master",
68-
"llbuild": "master",
69-
"swiftpm": "master",
70-
"swift-syntax": "master",
71-
"swift-stress-tester": "master",
72-
"compiler-rt": "stable",
73-
"swift-corelibs-xctest": "master",
74-
"swift-corelibs-foundation": "master",
75-
"swift-corelibs-libdispatch": "master",
76-
"swift-integration-tests": "master",
77-
"swift-xcode-playground-support": "master",
78-
"ninja": "release",
79-
"icu": "release-61-1",
80-
"cmake": "v3.15.1",
81-
"clang-tools-extra": "stable",
82-
"libcxx": "stable",
83-
"indexstore-db": "master",
84-
"sourcekit-lsp": "master",
85-
"swift-format": "master"
86-
}
87-
},
88-
"master-llvm-monorepo": {
89-
"aliases": ["master-llvm-monorepo", "swift/master"],
48+
"master": {
49+
"aliases": ["master", "swift/master"],
9050
"repos": {
9151
"llvm-project": "swift/master",
9252
"swift": "master",
@@ -111,33 +71,6 @@
11171
"aliases": ["next", "master-next",
11272
"stable-next", "upstream",
11373
"next-upstream", "upstream-with-swift"],
114-
"repos": {
115-
"llvm": "upstream-with-swift",
116-
"clang": "upstream-with-swift",
117-
"compiler-rt": "upstream-with-swift",
118-
"swift": "master-next",
119-
"lldb": "upstream-with-swift",
120-
"cmark": "master",
121-
"llbuild": "master",
122-
"swiftpm": "master",
123-
"swift-syntax": "master",
124-
"swift-stress-tester": "master",
125-
"swift-corelibs-xctest": "master",
126-
"swift-corelibs-foundation": "master",
127-
"swift-corelibs-libdispatch": "master",
128-
"swift-integration-tests": "master",
129-
"swift-xcode-playground-support": "master",
130-
"ninja": "release",
131-
"icu": "release-61-1",
132-
"cmake": "v3.15.1",
133-
"clang-tools-extra": "upstream-with-swift",
134-
"libcxx": "upstream-with-swift",
135-
"indexstore-db": "master",
136-
"sourcekit-lsp": "master"
137-
}
138-
},
139-
"master-next-llvm-monorepo" : {
140-
"aliases": ["master-next-llvm-monorepo"],
14174
"repos": {
14275
"llvm-project": "swift/master-next",
14376
"swift": "master-next",
@@ -158,19 +91,15 @@
15891
"sourcekit-lsp": "master"
15992
}
16093
},
161-
"swift-3.0-branch" : {
94+
"swift-3.0-branch" : {
16295
"aliases": ["swift-3.0-branch"],
16396
"repos": {
164-
"llvm": "swift-3.0-branch",
165-
"clang": "swift-3.0-branch",
166-
"swift": "swift-3.0-branch",
167-
"lldb": "swift-3.0-branch",
97+
"llvm-project": "swift/swift-3.0-branch",
16898
"cmark": "swift-3.0-branch",
16999
"llbuild": "swift-3.0-branch",
170100
"swiftpm": "swift-3.0-branch",
171101
"swift-syntax": "master",
172102
"swift-stress-tester": "master",
173-
"compiler-rt": "swift-3.0-branch",
174103
"swift-corelibs-xctest": "swift-3.0-branch",
175104
"swift-corelibs-foundation": "swift-3.0-branch",
176105
"swift-corelibs-libdispatch": "swift-3.0-branch",
@@ -184,16 +113,13 @@
184113
"swift-3.1-branch" : {
185114
"aliases": ["swift-3.1-branch"],
186115
"repos": {
187-
"llvm": "swift-3.1-branch",
188-
"clang": "swift-3.1-branch",
116+
"llvm-project": "swift/swift-3.1-branch",
189117
"swift": "swift-3.1-branch",
190-
"lldb": "swift-3.1-branch",
191118
"cmark": "swift-3.1-branch",
192119
"llbuild": "swift-3.1-branch",
193120
"swiftpm": "swift-3.1-branch",
194121
"swift-syntax": "master",
195122
"swift-stress-tester": "master",
196-
"compiler-rt": "swift-3.1-branch",
197123
"swift-corelibs-xctest": "swift-3.1-branch",
198124
"swift-corelibs-foundation": "swift-3.1-branch",
199125
"swift-corelibs-libdispatch": "swift-3.1-branch",
@@ -207,16 +133,13 @@
207133
"swift-4.0-branch" : {
208134
"aliases": ["swift-4.0-branch"],
209135
"repos": {
210-
"llvm": "swift-4.0-branch",
211-
"clang": "swift-4.0-branch",
136+
"llvm-project": "swift/swift-4.0-branch",
212137
"swift": "swift-4.0-branch",
213-
"lldb": "swift-4.0-branch",
214138
"cmark": "swift-4.0-branch",
215139
"llbuild": "swift-4.0-branch",
216140
"swiftpm": "swift-4.0-branch",
217141
"swift-syntax": "master",
218142
"swift-stress-tester": "master",
219-
"compiler-rt": "swift-4.0-branch",
220143
"swift-corelibs-xctest": "swift-4.0-branch",
221144
"swift-corelibs-foundation": "swift-4.0-branch",
222145
"swift-corelibs-libdispatch": "swift-4.0-branch",
@@ -230,16 +153,13 @@
230153
"swift-4.1-branch" : {
231154
"aliases": ["swift-4.1-branch"],
232155
"repos": {
233-
"llvm": "swift-4.1-branch",
234-
"clang": "swift-4.1-branch",
156+
"llvm-project": "swift/swift-4.1-branch",
235157
"swift": "swift-4.1-branch",
236-
"lldb": "swift-4.1-branch",
237158
"cmark": "swift-4.1-branch",
238159
"llbuild": "swift-4.1-branch",
239160
"swiftpm": "swift-4.1-branch",
240161
"swift-syntax": "master",
241162
"swift-stress-tester": "master",
242-
"compiler-rt": "swift-4.1-branch",
243163
"swift-corelibs-xctest": "swift-4.1-branch",
244164
"swift-corelibs-foundation": "swift-4.1-branch",
245165
"swift-corelibs-libdispatch": "swift-4.1-branch",
@@ -253,16 +173,13 @@
253173
"swift-4.2-branch" : {
254174
"aliases": ["swift-4.2-branch"],
255175
"repos": {
256-
"llvm": "swift-4.2-branch",
257-
"clang": "swift-4.2-branch",
176+
"llvm-project": "swift/swift-4.2-branch",
258177
"swift": "swift-4.2-branch",
259-
"lldb": "swift-4.2-branch",
260178
"cmark": "swift-4.2-branch",
261179
"llbuild": "swift-4.2-branch",
262180
"swiftpm": "swift-4.2-branch",
263181
"swift-syntax": "swift-4.2-branch",
264182
"swift-stress-tester": "master",
265-
"compiler-rt": "swift-4.2-branch",
266183
"swift-corelibs-xctest": "swift-4.2-branch",
267184
"swift-corelibs-foundation": "swift-4.2-branch",
268185
"swift-corelibs-libdispatch": "swift-4.2-branch",
@@ -276,11 +193,8 @@
276193
"swift-5.0-branch" : {
277194
"aliases": ["swift-5.0-branch"],
278195
"repos": {
279-
"llvm": "swift-5.0-branch",
280-
"clang": "swift-5.0-branch",
281-
"compiler-rt": "swift-5.0-branch",
196+
"llvm-project": "swift/swift-5.0-branch",
282197
"swift": "swift-5.0-branch",
283-
"lldb": "swift-5.0-branch",
284198
"cmark": "swift-5.0-branch",
285199
"llbuild": "swift-5.0-branch",
286200
"swiftpm": "swift-5.0-branch",
@@ -293,98 +207,15 @@
293207
"swift-xcode-playground-support": "swift-5.0-branch",
294208
"ninja": "release",
295209
"icu": "release-61-1",
296-
"clang-tools-extra": "swift-5.0-branch",
297-
"libcxx": "swift-5.0-branch",
298-
"indexstore-db": "master",
299-
"sourcekit-lsp": "master"
300-
}
301-
},
302-
"swift-5.1-old-llvm-branch" : {
303-
"aliases": ["swift-5.1-old-llvm-branch"],
304-
"repos": {
305-
"llvm": "swift-5.0-branch",
306-
"clang": "swift-5.0-branch",
307-
"compiler-rt": "swift-5.0-branch",
308-
"swift": "swift-5.1-old-llvm-branch",
309-
"lldb": "stable",
310-
"cmark": "master",
311-
"llbuild": "master",
312-
"swiftpm": "master",
313-
"swift-syntax": "master",
314-
"swift-stress-tester": "master",
315-
"swift-corelibs-xctest": "master",
316-
"swift-corelibs-foundation": "master",
317-
"swift-corelibs-libdispatch": "master",
318-
"swift-integration-tests": "master",
319-
"swift-xcode-playground-support": "master",
320-
"ninja": "release",
321-
"icu": "release-61-1",
322-
"clang-tools-extra": "swift-5.0-branch",
323-
"libcxx": "swift-5.0-branch",
324210
"indexstore-db": "master",
325211
"sourcekit-lsp": "master"
326212
}
327213
},
328-
"swift-5.1-branch" : {
329-
"aliases": ["swift-5.1-branch"],
214+
"swift-5.1-branch" : {
215+
"aliases": ["swift-5.1-branch", "swift/swift-5.1-branch"],
330216
"repos": {
331-
"llvm": "swift-5.1-branch",
332-
"clang": "swift-5.1-branch",
333-
"compiler-rt": "swift-5.1-branch",
217+
"llvm-project": "swift/swift-5.1-branch",
334218
"swift": "swift-5.1-branch",
335-
"lldb": "swift-5.1-branch",
336-
"cmark": "master",
337-
"llbuild": "swift-5.1-branch",
338-
"swiftpm": "swift-5.1-branch",
339-
"swift-syntax": "swift-5.1-branch",
340-
"swift-stress-tester": "swift-5.1-branch",
341-
"swift-corelibs-xctest": "swift-5.1-branch",
342-
"swift-corelibs-foundation": "swift-5.1-branch",
343-
"swift-corelibs-libdispatch": "swift-5.1-branch",
344-
"swift-integration-tests": "swift-5.1-branch",
345-
"swift-xcode-playground-support": "swift-5.1-branch",
346-
"ninja": "release",
347-
"icu": "release-61-1",
348-
"clang-tools-extra": "swift-5.1-branch",
349-
"libcxx": "swift-5.1-branch",
350-
"indexstore-db": "swift-5.1-branch",
351-
"sourcekit-lsp": "swift-5.1-branch"
352-
}
353-
},
354-
"swift-5.1-branch-04-24-2019" : {
355-
"aliases": ["swift-5.1-branch-04-24-2019"],
356-
"repos": {
357-
"llvm": "swift-5.1-branch",
358-
"clang": "swift-5.1-branch",
359-
"compiler-rt": "swift-5.1-branch",
360-
"swift": "swift-5.1-branch-04-24-2019",
361-
"lldb": "swift-5.1-branch",
362-
"cmark": "master",
363-
"llbuild": "swift-5.1-branch",
364-
"swiftpm": "swift-5.1-branch",
365-
"swift-syntax": "swift-5.1-branch-04-24-2019",
366-
"swift-stress-tester": "swift-5.1-branch",
367-
"swift-corelibs-xctest": "swift-5.1-branch",
368-
"swift-corelibs-foundation": "swift-5.1-branch",
369-
"swift-corelibs-libdispatch": "swift-5.1-branch",
370-
"swift-integration-tests": "swift-5.1-branch",
371-
"swift-xcode-playground-support": "swift-5.1-branch",
372-
"ninja": "release",
373-
"icu": "release-61-1",
374-
"clang-tools-extra": "swift-5.1-branch",
375-
"libcxx": "swift-5.1-branch",
376-
"indexstore-db": "swift-5.1-branch",
377-
"sourcekit-lsp": "swift-5.1-branch"
378-
}
379-
},
380-
"swift-5.1-branch-06-12-2019" : {
381-
"aliases": ["swift-5.1-branch-06-12-2019"],
382-
"repos": {
383-
"llvm": "swift-5.1-branch",
384-
"clang": "swift-5.1-branch",
385-
"compiler-rt": "swift-5.1-branch",
386-
"swift": "swift-5.1-branch-06-12-2019",
387-
"lldb": "swift-5.1-branch",
388219
"cmark": "master",
389220
"llbuild": "swift-5.1-branch",
390221
"swiftpm": "swift-5.1-branch",
@@ -397,68 +228,9 @@
397228
"swift-xcode-playground-support": "swift-5.1-branch",
398229
"ninja": "release",
399230
"icu": "release-61-1",
400-
"clang-tools-extra": "swift-5.1-branch",
401-
"libcxx": "swift-5.1-branch",
402231
"indexstore-db": "swift-5.1-branch",
403232
"sourcekit-lsp": "swift-5.1-branch"
404233
}
405-
},
406-
"master-20190619" : {
407-
"aliases": ["apple/stable/20190619",
408-
"master-apple-stable-20190619",
409-
"master-20190619"
410-
],
411-
"repos": {
412-
"llvm": "apple/stable/20190619",
413-
"clang": "apple/stable/20190619",
414-
"compiler-rt": "apple/stable/20190619",
415-
"swift": "master",
416-
"lldb": "stable",
417-
"cmark": "master",
418-
"llbuild": "master",
419-
"swiftpm": "master",
420-
"swift-syntax": "master",
421-
"swift-stress-tester": "master",
422-
"swift-corelibs-xctest": "master",
423-
"swift-corelibs-foundation": "master",
424-
"swift-corelibs-libdispatch": "master",
425-
"swift-integration-tests": "master",
426-
"swift-xcode-playground-support": "master",
427-
"ninja": "release",
428-
"icu": "release-61-1",
429-
"cmake": "v3.15.1",
430-
"clang-tools-extra": "apple/stable/20190619",
431-
"libcxx": "apple/stable/20190619",
432-
"indexstore-db": "master",
433-
"sourcekit-lsp": "master",
434-
"swift-format": "master"
435-
}
436-
},
437-
"stdlib_standalone" : {
438-
"aliases": ["stdlib_standalone"],
439-
"repos": {
440-
"llvm": "swift-DEVELOPMENT-SNAPSHOT-2019-06-06-a",
441-
"clang": "swift-DEVELOPMENT-SNAPSHOT-2019-06-06-a",
442-
"compiler-rt": "swift-DEVELOPMENT-SNAPSHOT-2019-06-06-a",
443-
"swift": "stdlib_standalone",
444-
"lldb": "swift-DEVELOPMENT-SNAPSHOT-2019-06-06-a",
445-
"cmark": "master",
446-
"llbuild": "swift-DEVELOPMENT-SNAPSHOT-2019-06-06-a",
447-
"swiftpm": "swift-DEVELOPMENT-SNAPSHOT-2019-06-06-a",
448-
"swift-syntax": "master",
449-
"swift-stress-tester": "swift-DEVELOPMENT-SNAPSHOT-2019-06-06-a",
450-
"swift-corelibs-xctest": "swift-DEVELOPMENT-SNAPSHOT-2019-06-06-a",
451-
"swift-corelibs-foundation": "swift-DEVELOPMENT-SNAPSHOT-2019-06-06-a",
452-
"swift-corelibs-libdispatch": "swift-DEVELOPMENT-SNAPSHOT-2019-06-06-a",
453-
"swift-integration-tests": "swift-DEVELOPMENT-SNAPSHOT-2019-06-06-a",
454-
"swift-xcode-playground-support": "swift-DEVELOPMENT-SNAPSHOT-2019-06-06-a",
455-
"ninja": "release",
456-
"icu": "release-61-1",
457-
"clang-tools-extra": "swift-DEVELOPMENT-SNAPSHOT-2019-06-06-a",
458-
"libcxx": "swift-DEVELOPMENT-SNAPSHOT-2019-06-06-a",
459-
"indexstore-db": "swift-DEVELOPMENT-SNAPSHOT-2019-06-06-a",
460-
"sourcekit-lsp": "swift-DEVELOPMENT-SNAPSHOT-2019-06-06-a"
461-
}
462234
}
463235
}
464236
}

0 commit comments

Comments
 (0)