Skip to content

[5.1] [LLVM Project] Update the update-checkout config to support #27765

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 3 commits into from
Oct 18, 2019
Merged

[5.1] [LLVM Project] Update the update-checkout config to support #27765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a82629d
[5.1] [LLVM Project] Update the update-checkout config to support
shahmishal Oct 17, 2019
e25042f
[LLVM Project] Symlink clang, llvm, compiler-rt, clang-tools-extra, a…
shahmishal Oct 17, 2019
09f4d04
[LLVM Project] Fix the update-checkout to use SWIFT_SOURCE_ROOT
shahmishal Oct 18, 2019
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
172 changes: 28 additions & 144 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 @@ -2,15 +2,9 @@
"ssh-clone-pattern": "[email protected]:%s.git",
"https-clone-pattern": "https://github.com/%s.git",
"repos" : {
"llvm": {
"remote": { "id": "apple/swift-llvm" } },
"clang": {
"remote": { "id": "apple/swift-clang" } },
"swift": {
"swift": {
"remote": { "id": "apple/swift" } },
"lldb": {
"remote": { "id": "apple/swift-lldb" } },
"cmark": {
"cmark": {
"remote": { "id": "apple/swift-cmark" } },
"llbuild": {
"remote": { "id": "apple/swift-llbuild" } },
Expand All @@ -20,8 +14,6 @@
"remote": { "id": "apple/swift-syntax" } },
"swift-stress-tester": {
"remote": { "id": "apple/swift-stress-tester" } },
"compiler-rt": {
"remote": { "id": "apple/swift-compiler-rt" } },
"swift-corelibs-xctest": {
"remote": { "id": "apple/swift-corelibs-xctest" } },
"swift-corelibs-foundation": {
Expand All @@ -38,39 +30,39 @@
"remote": { "id": "unicode-org/icu" },
"platforms": [ "Linux" ]
},
"libcxx": {
"remote": { "id": "apple/swift-libcxx" } },
"clang-tools-extra": {
"remote": { "id": "apple/swift-clang-tools-extra" } },
"indexstore-db": {
"cmake": {
"remote": { "id": "KitWare/CMake" },
"platforms": [ "Linux" ]
},
"indexstore-db": {
"remote": { "id": "apple/indexstore-db" } },
"sourcekit-lsp": {
"remote": { "id": "apple/sourcekit-lsp" } }
"remote": { "id": "apple/sourcekit-lsp" } },
"swift-format": {
"remote": { "id": "apple/swift-format" } },
"llvm-project": {
"remote": { "id": "apple/llvm-project" } }
},
"default-branch-scheme": "master",
"branch-schemes": {
"master": {
"aliases": ["master", "stable"],
"master": {
"aliases": ["master", "swift/master"],
"repos": {
"llvm": "stable",
"clang": "stable",
"llvm-project": "swift/master",
"swift": "master",
"lldb": "stable",
"cmark": "master",
"llbuild": "master",
"swiftpm": "master",
"swift-syntax": "master",
"swift-stress-tester": "master",
"compiler-rt": "stable",
"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-61-1",
"clang-tools-extra": "stable",
"libcxx": "stable",
"cmake": "v3.15.1",
"indexstore-db": "master",
"sourcekit-lsp": "master"
}
Expand All @@ -80,11 +72,8 @@
"stable-next", "upstream",
"next-upstream", "upstream-with-swift"],
"repos": {
"llvm": "upstream-with-swift",
"clang": "upstream-with-swift",
"compiler-rt": "upstream-with-swift",
"llvm-project": "swift/master-next",
"swift": "master-next",
"lldb": "upstream-with-swift",
"cmark": "master",
"llbuild": "master",
"swiftpm": "master",
Expand All @@ -97,25 +86,20 @@
"swift-xcode-playground-support": "master",
"ninja": "release",
"icu": "release-61-1",
"clang-tools-extra": "upstream-with-swift",
"libcxx": "upstream-with-swift",
"cmake": "v3.15.1",
"indexstore-db": "master",
"sourcekit-lsp": "master"
}
},
"swift-3.0-branch" : {
"swift-3.0-branch" : {
"aliases": ["swift-3.0-branch"],
"repos": {
"llvm": "swift-3.0-branch",
"clang": "swift-3.0-branch",
"swift": "swift-3.0-branch",
"lldb": "swift-3.0-branch",
"llvm-project": "swift/swift-3.0-branch",
"cmark": "swift-3.0-branch",
"llbuild": "swift-3.0-branch",
"swiftpm": "swift-3.0-branch",
"swift-syntax": "master",
"swift-stress-tester": "master",
"compiler-rt": "swift-3.0-branch",
"swift-corelibs-xctest": "swift-3.0-branch",
"swift-corelibs-foundation": "swift-3.0-branch",
"swift-corelibs-libdispatch": "swift-3.0-branch",
Expand All @@ -129,16 +113,13 @@
"swift-3.1-branch" : {
"aliases": ["swift-3.1-branch"],
"repos": {
"llvm": "swift-3.1-branch",
"clang": "swift-3.1-branch",
"llvm-project": "swift/swift-3.1-branch",
"swift": "swift-3.1-branch",
"lldb": "swift-3.1-branch",
"cmark": "swift-3.1-branch",
"llbuild": "swift-3.1-branch",
"swiftpm": "swift-3.1-branch",
"swift-syntax": "master",
"swift-stress-tester": "master",
"compiler-rt": "swift-3.1-branch",
"swift-corelibs-xctest": "swift-3.1-branch",
"swift-corelibs-foundation": "swift-3.1-branch",
"swift-corelibs-libdispatch": "swift-3.1-branch",
Expand All @@ -152,16 +133,13 @@
"swift-4.0-branch" : {
"aliases": ["swift-4.0-branch"],
"repos": {
"llvm": "swift-4.0-branch",
"clang": "swift-4.0-branch",
"llvm-project": "swift/swift-4.0-branch",
"swift": "swift-4.0-branch",
"lldb": "swift-4.0-branch",
"cmark": "swift-4.0-branch",
"llbuild": "swift-4.0-branch",
"swiftpm": "swift-4.0-branch",
"swift-syntax": "master",
"swift-stress-tester": "master",
"compiler-rt": "swift-4.0-branch",
"swift-corelibs-xctest": "swift-4.0-branch",
"swift-corelibs-foundation": "swift-4.0-branch",
"swift-corelibs-libdispatch": "swift-4.0-branch",
Expand All @@ -175,16 +153,13 @@
"swift-4.1-branch" : {
"aliases": ["swift-4.1-branch"],
"repos": {
"llvm": "swift-4.1-branch",
"clang": "swift-4.1-branch",
"llvm-project": "swift/swift-4.1-branch",
"swift": "swift-4.1-branch",
"lldb": "swift-4.1-branch",
"cmark": "swift-4.1-branch",
"llbuild": "swift-4.1-branch",
"swiftpm": "swift-4.1-branch",
"swift-syntax": "master",
"swift-stress-tester": "master",
"compiler-rt": "swift-4.1-branch",
"swift-corelibs-xctest": "swift-4.1-branch",
"swift-corelibs-foundation": "swift-4.1-branch",
"swift-corelibs-libdispatch": "swift-4.1-branch",
Expand All @@ -198,16 +173,13 @@
"swift-4.2-branch" : {
"aliases": ["swift-4.2-branch"],
"repos": {
"llvm": "swift-4.2-branch",
"clang": "swift-4.2-branch",
"llvm-project": "swift/swift-4.2-branch",
"swift": "swift-4.2-branch",
"lldb": "swift-4.2-branch",
"cmark": "swift-4.2-branch",
"llbuild": "swift-4.2-branch",
"swiftpm": "swift-4.2-branch",
"swift-syntax": "swift-4.2-branch",
"swift-stress-tester": "master",
"compiler-rt": "swift-4.2-branch",
"swift-corelibs-xctest": "swift-4.2-branch",
"swift-corelibs-foundation": "swift-4.2-branch",
"swift-corelibs-libdispatch": "swift-4.2-branch",
Expand All @@ -221,11 +193,8 @@
"swift-5.0-branch" : {
"aliases": ["swift-5.0-branch"],
"repos": {
"llvm": "swift-5.0-branch",
"clang": "swift-5.0-branch",
"compiler-rt": "swift-5.0-branch",
"llvm-project": "swift/swift-5.0-branch",
"swift": "swift-5.0-branch",
"lldb": "swift-5.0-branch",
"cmark": "swift-5.0-branch",
"llbuild": "swift-5.0-branch",
"swiftpm": "swift-5.0-branch",
Expand All @@ -238,98 +207,15 @@
"swift-xcode-playground-support": "swift-5.0-branch",
"ninja": "release",
"icu": "release-61-1",
"clang-tools-extra": "swift-5.0-branch",
"libcxx": "swift-5.0-branch",
"indexstore-db": "master",
"sourcekit-lsp": "master"
}
},
"swift-5.1-old-llvm-branch" : {
"aliases": ["swift-5.1-old-llvm-branch"],
"repos": {
"llvm": "swift-5.0-branch",
"clang": "swift-5.0-branch",
"compiler-rt": "swift-5.0-branch",
"swift": "swift-5.1-old-llvm-branch",
"lldb": "stable",
"cmark": "master",
"llbuild": "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-61-1",
"clang-tools-extra": "swift-5.0-branch",
"libcxx": "swift-5.0-branch",
"indexstore-db": "master",
"sourcekit-lsp": "master"
}
},
"swift-5.1-branch" : {
"aliases": ["swift-5.1-branch"],
"swift-5.1-branch" : {
"aliases": ["swift-5.1-branch", "swift/swift-5.1-branch"],
"repos": {
"llvm": "swift-5.1-branch",
"clang": "swift-5.1-branch",
"compiler-rt": "swift-5.1-branch",
"llvm-project": "swift/swift-5.1-branch",
"swift": "swift-5.1-branch",
"lldb": "swift-5.1-branch",
"cmark": "master",
"llbuild": "swift-5.1-branch",
"swiftpm": "swift-5.1-branch",
"swift-syntax": "swift-5.1-branch",
"swift-stress-tester": "swift-5.1-branch",
"swift-corelibs-xctest": "swift-5.1-branch",
"swift-corelibs-foundation": "swift-5.1-branch",
"swift-corelibs-libdispatch": "swift-5.1-branch",
"swift-integration-tests": "swift-5.1-branch",
"swift-xcode-playground-support": "swift-5.1-branch",
"ninja": "release",
"icu": "release-61-1",
"clang-tools-extra": "swift-5.1-branch",
"libcxx": "swift-5.1-branch",
"indexstore-db": "swift-5.1-branch",
"sourcekit-lsp": "swift-5.1-branch"
}
},
"swift-5.1-branch-04-24-2019" : {
"aliases": ["swift-5.1-branch-04-24-2019"],
"repos": {
"llvm": "swift-5.1-branch",
"clang": "swift-5.1-branch",
"compiler-rt": "swift-5.1-branch",
"swift": "swift-5.1-branch-04-24-2019",
"lldb": "swift-5.1-branch",
"cmark": "master",
"llbuild": "swift-5.1-branch",
"swiftpm": "swift-5.1-branch",
"swift-syntax": "swift-5.1-branch-04-24-2019",
"swift-stress-tester": "swift-5.1-branch",
"swift-corelibs-xctest": "swift-5.1-branch",
"swift-corelibs-foundation": "swift-5.1-branch",
"swift-corelibs-libdispatch": "swift-5.1-branch",
"swift-integration-tests": "swift-5.1-branch",
"swift-xcode-playground-support": "swift-5.1-branch",
"ninja": "release",
"icu": "release-61-1",
"clang-tools-extra": "swift-5.1-branch",
"libcxx": "swift-5.1-branch",
"indexstore-db": "swift-5.1-branch",
"sourcekit-lsp": "swift-5.1-branch"
}
},
"swift-5.1-branch-06-12-2019" : {
"aliases": ["swift-5.1-branch-06-12-2019"],
"repos": {
"llvm": "swift-5.1-branch",
"clang": "swift-5.1-branch",
"compiler-rt": "swift-5.1-branch",
"swift": "swift-5.1-branch-06-12-2019",
"lldb": "swift-5.1-branch",
"cmark": "master",
"llbuild": "swift-5.1-branch",
"swiftpm": "swift-5.1-branch",
Expand All @@ -342,8 +228,6 @@
"swift-xcode-playground-support": "swift-5.1-branch",
"ninja": "release",
"icu": "release-61-1",
"clang-tools-extra": "swift-5.1-branch",
"libcxx": "swift-5.1-branch",
"indexstore-db": "swift-5.1-branch",
"sourcekit-lsp": "swift-5.1-branch"
}
Expand Down
16 changes: 16 additions & 0 deletions utils/update_checkout/update_checkout/update_checkout.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,21 @@ def skip_list_for_platform(config):

return skip_list

def symlink_llvm_monorepo(args):
print("Create symlink for LLVM Project")
llvm_projects = ['clang',
'llvm',
'lldb',
'compiler-rt',
'libcxx',
'clang-tools-extra']
for project in llvm_projects:
src_path = os.path.join(SWIFT_SOURCE_ROOT,
'llvm-project',
project)
dst_path = os.path.join(SWIFT_SOURCE_ROOT, project)
if not os.path.islink(dst_path):
os.symlink(src_path, dst_path)

def main():
freeze_support()
Expand Down Expand Up @@ -554,5 +569,6 @@ def main():
if fail_count > 0:
print("update-checkout failed, fix errors and try again")
else:
symlink_llvm_monorepo(args)
print("update-checkout succeeded")
sys.exit(fail_count)