Skip to content

Commit 312bdb2

Browse files
bob-wilsonbob-wilson
committed
[update-checkout] Remove some old configs that are no longer used.
The checkout configs included some old dated branches that are no longer used. They are unlikely to work well anyway because the corresponding Clang/LLVM branches moved forward independently. Remove those config entries. Also re-order the 4.0 and 4.1 configs to be consistent.
1 parent f74b7e5 commit 312bdb2

File tree

1 file changed

+15
-111
lines changed

1 file changed

+15
-111
lines changed

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

Lines changed: 15 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -73,26 +73,6 @@
7373
"ninja": "release"
7474
}
7575
},
76-
"swift5-transition" : {
77-
"aliases": ["swift5-transition", "llvm-swift5-transition",
78-
"master-llvm-swift5-transition"],
79-
"repos": {
80-
"llvm": "swift-5.0-branch",
81-
"clang": "swift-5.0-branch",
82-
"compiler-rt": "swift-5.0-branch",
83-
"swift": "master-llvm-swift5-transition",
84-
"lldb": "llvm-swift5-transition",
85-
"cmark": "master",
86-
"llbuild": "master",
87-
"swiftpm": "master",
88-
"swift-corelibs-xctest": "master",
89-
"swift-corelibs-foundation": "master",
90-
"swift-corelibs-libdispatch": "master",
91-
"swift-integration-tests": "master",
92-
"swift-xcode-playground-support": "master",
93-
"ninja": "release"
94-
}
95-
},
9676
"swift-3.0-branch" : {
9777
"aliases": ["swift-3.0-branch"],
9878
"repos": {
@@ -131,25 +111,6 @@
131111
"ninja": "release"
132112
}
133113
},
134-
"swift-4.1-branch" : {
135-
"aliases": ["swift-4.1-branch"],
136-
"repos": {
137-
"llvm": "swift-4.1-branch",
138-
"clang": "swift-4.1-branch",
139-
"swift": "swift-4.1-branch",
140-
"lldb": "swift-4.1-branch",
141-
"cmark": "swift-4.1-branch",
142-
"llbuild": "swift-4.1-branch",
143-
"swiftpm": "swift-4.1-branch",
144-
"compiler-rt": "swift-4.1-branch",
145-
"swift-corelibs-xctest": "swift-4.1-branch",
146-
"swift-corelibs-foundation": "swift-4.1-branch",
147-
"swift-corelibs-libdispatch": "swift-4.1-branch",
148-
"swift-integration-tests": "swift-4.1-branch",
149-
"swift-xcode-playground-support": "swift-4.1-branch",
150-
"ninja": "release"
151-
}
152-
},
153114
"swift-4.0-branch" : {
154115
"aliases": ["swift-4.0-branch"],
155116
"repos": {
@@ -169,22 +130,22 @@
169130
"ninja": "release"
170131
}
171132
},
172-
"swift-4.0-branch-07-11-2017" : {
173-
"aliases": ["swift-4.0-branch-07-11-2017"],
133+
"swift-4.1-branch" : {
134+
"aliases": ["swift-4.1-branch"],
174135
"repos": {
175-
"llvm": "swift-4.0-branch-07-11-2017",
176-
"clang": "swift-4.0-branch-07-11-2017",
177-
"swift": "swift-4.0-branch-07-11-2017",
178-
"lldb": "swift-4.0-branch-07-11-2017",
179-
"cmark": "swift-4.0-branch",
180-
"llbuild": "swift-4.0-branch",
181-
"swiftpm": "swift-4.0-branch",
182-
"compiler-rt": "swift-4.0-branch-07-11-2017",
183-
"swift-corelibs-xctest": "swift-4.0-branch",
184-
"swift-corelibs-foundation": "swift-4.0-branch",
185-
"swift-corelibs-libdispatch": "swift-4.0-branch",
186-
"swift-integration-tests": "swift-4.0-branch",
187-
"swift-xcode-playground-support": "swift-4.0-branch",
136+
"llvm": "swift-4.1-branch",
137+
"clang": "swift-4.1-branch",
138+
"swift": "swift-4.1-branch",
139+
"lldb": "swift-4.1-branch",
140+
"cmark": "swift-4.1-branch",
141+
"llbuild": "swift-4.1-branch",
142+
"swiftpm": "swift-4.1-branch",
143+
"compiler-rt": "swift-4.1-branch",
144+
"swift-corelibs-xctest": "swift-4.1-branch",
145+
"swift-corelibs-foundation": "swift-4.1-branch",
146+
"swift-corelibs-libdispatch": "swift-4.1-branch",
147+
"swift-integration-tests": "swift-4.1-branch",
148+
"swift-xcode-playground-support": "swift-4.1-branch",
188149
"ninja": "release"
189150
}
190151
},
@@ -207,63 +168,6 @@
207168
"ninja": "release"
208169
}
209170
},
210-
"swift-4.2-branch-03-26-2018" : {
211-
"aliases": ["swift-4.2-branch-03-26-2018"],
212-
"repos": {
213-
"llvm": "swift-4.2-branch-03-26-2018",
214-
"clang": "swift-4.2-branch-03-26-2018",
215-
"swift": "swift-4.2-branch-03-26-2018",
216-
"lldb": "swift-4.2-branch-03-26-2018",
217-
"cmark": "master",
218-
"llbuild": "master",
219-
"swiftpm": "master",
220-
"compiler-rt": "swift-4.2-branch-03-26-2018",
221-
"swift-corelibs-xctest": "swift-4.2-branch",
222-
"swift-corelibs-foundation": "swift-4.2-branch",
223-
"swift-corelibs-libdispatch": "swift-4.2-branch",
224-
"swift-integration-tests": "master",
225-
"swift-xcode-playground-support": "master",
226-
"ninja": "release"
227-
}
228-
},
229-
"swift-4.2-branch-04-20-2018" : {
230-
"aliases": ["swift-4.2-branch-04-20-2018"],
231-
"repos": {
232-
"llvm": "swift-4.2-branch-04-20-2018",
233-
"clang": "swift-4.2-branch-04-20-2018",
234-
"swift": "swift-4.2-branch-04-20-2018",
235-
"lldb": "swift-4.2-branch-04-20-2018",
236-
"cmark": "master",
237-
"llbuild": "master",
238-
"swiftpm": "master",
239-
"compiler-rt": "swift-4.2-branch-04-20-2018",
240-
"swift-corelibs-xctest": "swift-4.2-branch-04-20-2018",
241-
"swift-corelibs-foundation": "swift-4.2-branch-04-20-2018",
242-
"swift-corelibs-libdispatch": "swift-4.2-branch-04-20-2018",
243-
"swift-integration-tests": "swift-4.2-branch",
244-
"swift-xcode-playground-support": "swift-4.2-branch",
245-
"ninja": "release"
246-
}
247-
},
248-
"swift-4.2-branch-06-11-2018" : {
249-
"aliases": ["swift-4.2-branch-06-11-2018"],
250-
"repos": {
251-
"llvm": "swift-4.2-branch",
252-
"clang": "swift-4.2-branch",
253-
"swift": "swift-4.2-branch-06-11-2018",
254-
"lldb": "swift-4.2-branch",
255-
"cmark": "swift-4.2-branch",
256-
"llbuild": "swift-4.2-branch",
257-
"swiftpm": "swift-4.2-branch",
258-
"compiler-rt": "swift-4.2-branch",
259-
"swift-corelibs-xctest": "swift-4.2-branch",
260-
"swift-corelibs-foundation": "swift-4.2-branch",
261-
"swift-corelibs-libdispatch": "swift-4.2-branch",
262-
"swift-integration-tests": "swift-4.2-branch",
263-
"swift-xcode-playground-support": "swift-4.2-branch",
264-
"ninja": "release"
265-
}
266-
},
267171
"swift-5.0-branch" : {
268172
"aliases": ["swift-5.0-branch"],
269173
"repos": {

0 commit comments

Comments
 (0)