WIP

Author: pedrovgs

.github/workflows/wasm.yml

@@ -15,16 +15,31 @@ jobs:
       - uses: actions/checkout@v4
 
       # Install the specific Swift development snapshot required for WASM builds
+      # Toolchain comes from SwiftWasm releases (includes WASM support)
       - name: Install Swift Toolchain
         run: |
-          SWIFT_URL="https://download.swift.org/development/ubuntu2404/swift-${SWIFT_TOOLCHAIN_VERSION}/swift-${SWIFT_TOOLCHAIN_VERSION}-ubuntu24.04.tar.gz"
+          SWIFT_URL="https://github.com/swiftwasm/swift/releases/download/swift-wasm-${SWIFT_TOOLCHAIN_VERSION}/swift-wasm-${SWIFT_TOOLCHAIN_VERSION}-ubuntu24.04_x86_64.tar.gz"
           echo "Downloading Swift toolchain from: $SWIFT_URL"
-          curl -sL "$SWIFT_URL" | tar xz --strip-components=1 -C /opt
-          echo "/opt/usr/bin" >> $GITHUB_PATH
+          mkdir -p /opt/swift
+          curl -sL "$SWIFT_URL" | tar xz --strip-components=1 -C /opt/swift
+          echo "/opt/swift/usr/bin" >> $GITHUB_PATH
 
       - name: Verify Swift Installation
         run: swift --version
 
+      # Install the matching WASM SDK
+      - name: Install WASM SDK
+        run: |
+          SDK_URL="https://github.com/swiftwasm/swift/releases/download/swift-wasm-${SWIFT_TOOLCHAIN_VERSION}/swift-wasm-${SWIFT_TOOLCHAIN_VERSION}-wasm32-unknown-wasip1-threads.artifactbundle.zip"
+          echo "Installing WASM SDK from: $SDK_URL"
+          swift sdk install "$SDK_URL" || true
+          echo "Installed SDKs:"
+          swift sdk list
+
+      # Set environment variable to signal the correct toolchain is installed
+      - name: Set Toolchain Environment
+        run: echo "SWIFT_WASM_TOOLCHAIN_VERIFIED=1" >> $GITHUB_ENV
+
       # Wasmtime is required because `swift test` doesn't work for WebAssembly targets.
       # For WASM, we must build tests separately and run them with a WASM runtime.
       # See: https://book.swiftwasm.org/getting-started/testing.html

scripts/build-and-test-wasm.sh

@@ -41,17 +41,15 @@ setup_swift() {
     echo "📦 Setting up Swift..."
     echo "   Required toolchain: $REQUIRED_TOOLCHAIN_VERSION"
 
-    # First, check if Swift in PATH is the required development snapshot (CI environment)
-    if command -v swift &> /dev/null; then
+    # In CI, the workflow installs the exact toolchain and sets this env var
+    if [ "${SWIFT_WASM_TOOLCHAIN_VERIFIED:-}" = "1" ] && command -v swift &> /dev/null; then
+        SWIFT_CMD="swift"
+        SWIFT_VERSION="dev"
         local VERSION_OUTPUT=$(swift --version 2>/dev/null | head -1)
-        if echo "$VERSION_OUTPUT" | grep -q "$REQUIRED_TOOLCHAIN_VERSION"; then
-            SWIFT_CMD="swift"
-            SWIFT_VERSION="dev"
-            echo "✅ Using required toolchain from PATH"
-            echo "   Version: $VERSION_OUTPUT"
-            echo ""
-            return 0
-        fi
+        echo "✅ Using CI-installed toolchain"
+        echo "   Version: $VERSION_OUTPUT"
+        echo ""
+        return 0
     fi
 
     # Check for local SwiftWasm toolchain (macOS development with newer SDK)