Skip to content

Commit aed1701

Browse files
authored
Merge pull request #868 from kkebo/refactor-ci-script
ci: refactor CI script
2 parents f7567a5 + 880e1cc commit aed1701

1 file changed

Lines changed: 2 additions & 7 deletions

File tree

.github/workflows/swiftwasm.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ jobs:
1919
- sdk:
2020
url: https://download.swift.org/development/wasm-sdk/swift-DEVELOPMENT-SNAPSHOT-2026-07-11-a/swift-DEVELOPMENT-SNAPSHOT-2026-07-11-a_wasm.artifactbundle.tar.gz
2121
checksum: 6a6e928fdd939d1120aa36a5b54085835137d682c1d4c0c3a1e49a8f7ea7d977
22-
id: swift-DEVELOPMENT-SNAPSHOT-2026-07-11-a_wasm
2322
artifact-name: swift-format.wasm
2423
other-wasmopt-flags:
2524
runs-on: ubuntu-24.04-arm
@@ -38,11 +37,10 @@ jobs:
3837
run: swift sdk install "$SDK_URL" --checksum "$SDK_CHECKSUM"
3938
- name: Build
4039
env:
41-
SDK_ID: ${{ matrix.target.sdk.id }}
4240
WASMOPT_FLAGS: ${{ matrix.target.other-wasmopt-flags }}
4341
ARTIFACT_NAME: ${{ matrix.target.artifact-name }}
4442
run: |
45-
swift build --product swift-format --swift-sdk "$SDK_ID" -c release --build-system native
43+
swift build --product swift-format --swift-sdk "$(swiftc -print-target-info | jq -r '.swiftCompilerTag')_wasm" -c release --build-system native
4644
wasm-strip .build/release/swift-format.wasm
4745
wasm-opt -Oz --enable-bulk-memory --enable-sign-ext --enable-nontrapping-float-to-int $WASMOPT_FLAGS .build/release/swift-format.wasm -o "$ARTIFACT_NAME"
4846
- name: Upload ${{ matrix.target.artifact-name }}
@@ -83,7 +81,6 @@ jobs:
8381
- sdk:
8482
url: https://download.swift.org/development/wasm-sdk/swift-DEVELOPMENT-SNAPSHOT-2026-07-11-a/swift-DEVELOPMENT-SNAPSHOT-2026-07-11-a_wasm.artifactbundle.tar.gz
8583
checksum: 6a6e928fdd939d1120aa36a5b54085835137d682c1d4c0c3a1e49a8f7ea7d977
86-
id: swift-DEVELOPMENT-SNAPSHOT-2026-07-11-a_wasm
8784
runs-on: ubuntu-24.04-arm
8885
permissions:
8986
contents: read
@@ -100,9 +97,7 @@ jobs:
10097
SDK_URL: ${{ matrix.target.sdk.url }}
10198
SDK_CHECKSUM: ${{ matrix.target.sdk.checksum }}
10299
run: swift sdk install "$SDK_URL" --checksum "$SDK_CHECKSUM"
103-
- env:
104-
SDK_ID: ${{ matrix.target.sdk.id }}
105-
run: swift test --swift-sdk "$SDK_ID" --toolset wasi-test-toolset.json --build-system native
100+
- run: swift test --swift-sdk "$(swiftc -print-target-info | jq -r '.swiftCompilerTag')_wasm" --toolset wasi-test-toolset.json --build-system native
106101
results:
107102
if: ${{ always() }}
108103
runs-on: ubuntu-24.04-arm

0 commit comments

Comments
 (0)