From 29f99937c4eaa8116fe9f3656f236fdfa274959c Mon Sep 17 00:00:00 2001 From: mustiikhalil <26250654+mustiikhalil@users.noreply.github.com> Date: Tue, 2 Dec 2025 02:13:22 +0100 Subject: [PATCH] Migrating to swift wasm on for github actions (#8814) Migrate to use the native SDK for Wasm that's built for swift --- .github/workflows/build.yml | 15 +++++++++------ tests/swift/Wasm.tests/.swift-version | 2 +- tests/swift/Wasm.tests/Package.swift | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f3ea12d81..7d583047d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -530,17 +530,20 @@ jobs: build-swift-wasm: name: Test Swift Wasm runs-on: ubuntu-24.04 - container: - image: ghcr.io/swiftwasm/carton:0.20.1 steps: - uses: actions/checkout@v3 - - uses: bytecodealliance/actions/wasmtime/setup@v1 - - uses: swiftwasm/setup-swiftwasm@v1 + - uses: swift-actions/setup-swift@v2 with: - swift-version: "wasm-6.0.2-RELEASE" + swift-version: 6.2.1 + - uses: bytecodealliance/actions/wasmtime/setup@v1 + - name: Install Swift SDK + run: swift sdk install https://download.swift.org/swift-6.2.1-release/wasm-sdk/swift-6.2.1-RELEASE/swift-6.2.1-RELEASE_wasm.artifactbundle.tar.gz --checksum 482b9f95462b87bedfafca94a092cf9ec4496671ca13b43745097122d20f18af - name: Test working-directory: tests/swift/Wasm.tests - run: swift run carton test + run: | + swift sdk list + swift build --build-tests --swift-sdk swift-6.2.1-RELEASE_wasm + wasmtime --dir . .build/wasm32-unknown-wasip1/debug/FlatBuffers.Test.Swift.WasmPackageTests.xctest build-ts: name: Build TS diff --git a/tests/swift/Wasm.tests/.swift-version b/tests/swift/Wasm.tests/.swift-version index a00b46703..0df17dd0f 100644 --- a/tests/swift/Wasm.tests/.swift-version +++ b/tests/swift/Wasm.tests/.swift-version @@ -1 +1 @@ -wasm-6.0.2-RELEASE \ No newline at end of file +6.2.1 \ No newline at end of file diff --git a/tests/swift/Wasm.tests/Package.swift b/tests/swift/Wasm.tests/Package.swift index 9bdf1f11b..c2f7dcbf2 100644 --- a/tests/swift/Wasm.tests/Package.swift +++ b/tests/swift/Wasm.tests/Package.swift @@ -24,7 +24,7 @@ let package = Package( ], dependencies: [ .package(path: "../../.."), - .package(url: "https://github.com/swiftwasm/carton", exact: "1.1.2"), + .package(url: "https://github.com/swiftwasm/WasmKit", exact: "0.1.6") ], targets: [ .target(name: "Wasm"),