Use swift-sdk-generator from update-checkout instead of submodule

.github/dependabot.yml

@@ -9,7 +9,3 @@ updates:
     directory: '/'
     schedule:
       interval: 'weekly'
-  - package-ecosystem: 'gitsubmodule'
-    directory: '/'
-    schedule:
-      interval: 'daily'

.github/scripts/build-matrix.rb

@@ -27,7 +27,6 @@ def affected_schemes(changes, schemes)
     prefixes = [
       "schemes/#{scheme}/",
       "tools/build/",
-      "tools/swift-sdk-generator",
       "tools/git-swift-workspace",
     ]
     changes.any? do |change|

.github/workflows/build-toolchain.yml

@@ -35,7 +35,6 @@ jobs:
             changed:
               - "schemes/**"
               - "tools/build/**"
-              - "tools/swift-sdk-generator"
               - "tools/git-swift-workspace"
 
       - name: Generate entries
@@ -129,7 +128,7 @@ jobs:
         run: |
           rm -rf ${{ github.workspace }}/build \
             ${{ github.workspace }}/swift \
-            ${{ github.workspace }}/swiftwasm-build/tools/swift-sdk-generator/Bundles \
+            ${{ github.workspace }}/swift-sdk-generator/Bundles \
             ${{ github.workspace }}/build-cache \
             ${{ github.workspace }}/build-sdk
 
@@ -274,7 +273,7 @@ jobs:
           docker exec swiftwasm-ci-buildbot /bin/bash -lc \
             "./llvm-project/llvm/utils/lit/lit.py \
               --param swift-sdk=wasm32-unknown-wasi \
-              --param swift-sdks-path=./swiftwasm-build/tools/swift-sdk-generator/Bundles \
+              --param swift-sdks-path=./swift-sdk-generator/Bundles \
               --param scheme=${{ matrix.scheme }} ./swiftwasm-build/test -vv"
 
       - name: Cleanup docker volume

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/build/package-toolchain

@@ -118,7 +118,7 @@ class PackageSwiftSDKAction(Action):
         :param wasi_sysroot_path: The path to the WASI sysroot.
         """
         sdk_generator_pkg_path = os.path.join(
-            os.path.dirname(__file__), "..", "swift-sdk-generator")
+            os.path.dirname(__file__), "..", "..", "..", "swift-sdk-generator")
         sdk_generator_args = [
             "swift",
             "run", "--package-path", sdk_generator_pkg_path,

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', 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'),