Skip to content

Commit 62f8f5c

Browse files
Use swift-sdk-generator from update-checkout instead of submodule
1 parent 41bd008 commit 62f8f5c

File tree

6 files changed

+3
-13
lines changed

6 files changed

+3
-13
lines changed

.github/dependabot.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,3 @@ updates:
99
directory: '/'
1010
schedule:
1111
interval: 'weekly'
12-
- package-ecosystem: 'gitsubmodule'
13-
directory: '/'
14-
schedule:
15-
interval: 'daily'

.github/scripts/build-matrix.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ def affected_schemes(changes, schemes)
2727
prefixes = [
2828
"schemes/#{scheme}/",
2929
"tools/build/",
30-
"tools/swift-sdk-generator",
3130
"tools/git-swift-workspace",
3231
]
3332
changes.any? do |change|

.github/workflows/build-toolchain.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ jobs:
3535
changed:
3636
- "schemes/**"
3737
- "tools/build/**"
38-
- "tools/swift-sdk-generator"
3938
- "tools/git-swift-workspace"
4039
4140
- name: Generate entries
@@ -129,7 +128,7 @@ jobs:
129128
run: |
130129
rm -rf ${{ github.workspace }}/build \
131130
${{ github.workspace }}/swift \
132-
${{ github.workspace }}/swiftwasm-build/tools/swift-sdk-generator/Bundles \
131+
${{ github.workspace }}/swift-sdk-generator/Bundles \
133132
${{ github.workspace }}/build-cache \
134133
${{ github.workspace }}/build-sdk
135134
@@ -274,7 +273,7 @@ jobs:
274273
docker exec swiftwasm-ci-buildbot /bin/bash -lc \
275274
"./llvm-project/llvm/utils/lit/lit.py \
276275
--param swift-sdk=wasm32-unknown-wasi \
277-
--param swift-sdks-path=./swiftwasm-build/tools/swift-sdk-generator/Bundles \
276+
--param swift-sdks-path=./swift-sdk-generator/Bundles \
278277
--param scheme=${{ matrix.scheme }} ./swiftwasm-build/test -vv"
279278
280279
- name: Cleanup docker volume

.gitmodules

Lines changed: 0 additions & 3 deletions
This file was deleted.

tools/build/package-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ class PackageSwiftSDKAction(Action):
118118
:param wasi_sysroot_path: The path to the WASI sysroot.
119119
"""
120120
sdk_generator_pkg_path = os.path.join(
121-
os.path.dirname(__file__), "..", "swift-sdk-generator")
121+
os.path.dirname(__file__), "..", "..", "..", "swift-sdk-generator")
122122
sdk_generator_args = [
123123
"swift",
124124
"run", "--package-path", sdk_generator_pkg_path,

tools/swift-sdk-generator

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)