Checkout swiftlang/swift-sdk-generator manually

Author: kateinoigakukun

tools/build/build_support/actions.py

@@ -25,18 +25,25 @@ def system(self, *args):
             raise Exception('Command failed: {}'.format(' '.join(args)))
 
 class CloneAction(Action):
+    def __init__(self, options, repo: str, branch: str):
+        super().__init__(options)
+        self.repo = repo
+        self.repo_basename = repo.split('/')[-1]
+        self.branch = branch
+
     def run(self):
-        if os.path.exists("../swift/.git"):
+        repo_dir = os.path.join('..', self.repo_basename)
+        if os.path.exists(os.path.join(repo_dir, '.git')):
             return
         print('=====> Cloning Swift repository')
         git_options = []
         if self.options.skip_history:
-            git_options += ['--depth', '1', '--branch', self.options.tag]
+            git_options += ['--depth', '1', '--branch', self.branch]
 
-        args = ['git', 'clone'] + git_options + ['https://github.com/apple/swift.git', '../swift']
+        args = ['git', 'clone'] + git_options + [f'https://github.com/{self.repo}.git', repo_dir]
         self.system(*args)
-        print('=====> Checking out Swift tag {}'.format(self.options.tag))
-        self.system('git', '-C', '../swift', 'checkout', self.options.tag)
+        print('=====> Checking out Swift tag {}'.format(self.branch))
+        self.system('git', '-C', repo_dir, 'checkout', self.branch)
 
 class UpdateCheckoutAction(Action):
     def run(self):

tools/git-swift-workspace

@@ -21,7 +21,15 @@ def main():
                         default=[])
     options = derive_options_from_args(sys.argv[1:], parser)
     actions = [
-        CloneAction(options), UpdateCheckoutAction(options),
+        CloneAction(options, 'swiftlang/swift', self.options.tag),
+        UpdateCheckoutAction(options),
+    ]
+    if options.scheme == 'release-6.0':
+        # release/6.0 doesn't have swift-sdk-generator configuration in update-checkout
+        # so we need to clone it manually
+        actions.append(CloneAction(options, 'swiftlang/swift-sdk-generator', 'swift-6.1-RELEASE'))
+
+    actions = actions + [
         ApplyPatchesAction(options, 'swift'),
         CheckoutCorelibsAction(options),
         ApplyPatchesAction(options, 'swift-corelibs-foundation'),