From 253c88bb3b0ea1d6f5839cb7a713317022cbf3e6 Mon Sep 17 00:00:00 2001 From: Stephen Celis Date: Mon, 20 Jan 2025 11:32:15 -0800 Subject: [PATCH 1/2] Fix Linux/Wasm CI --- .github/workflows/ci.yml | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 071c8fd..5f485e2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,30 +26,34 @@ jobs: linux: name: Linux + strategy: + matrix: + swift: + - '6.0' runs-on: ubuntu-latest + container: swift:${{ matrix.swift }} steps: - - name: Install Swift - uses: slashmo/install-swift@v0.4.0 - with: - version: swift-5.9-DEVELOPMENT-SNAPSHOT-2023-09-16-a - uses: actions/checkout@v4 - name: Run tests run: swift test - # NB: 5.9 snapshot unavailable, wait for release - # wasm: - # name: Wasm - # runs-on: ubuntu-latest - # strategy: - # matrix: - # include: - # - { toolchain: wasm-5.9-RELEASE } - # steps: - # - uses: actions/checkout@v4 - # - run: echo "${{ matrix.toolchain }}" > .swift-version - # - uses: swiftwasm/swiftwasm-action@v5.9 - # with: - # shell-action: carton test --environment node + wasm: + name: Wasm + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: bytecodealliance/actions/wasmtime/setup@v1 + - name: Install Swift and Swift SDK for WebAssembly + run: | + PREFIX=/opt/swift + set -ex + curl -f -o /tmp/swift.tar.gz "https://download.swift.org/swift-6.0.2-release/ubuntu2204/swift-6.0.2-RELEASE/swift-6.0.2-RELEASE-ubuntu22.04.tar.gz" + sudo mkdir -p $PREFIX; sudo tar -xzf /tmp/swift.tar.gz -C $PREFIX --strip-component 1 + $PREFIX/usr/bin/swift sdk install https://github.com/swiftwasm/swift/releases/download/swift-wasm-6.0.2-RELEASE/swift-wasm-6.0.2-RELEASE-wasm32-unknown-wasi.artifactbundle.zip --checksum 6ffedb055cb9956395d9f435d03d53ebe9f6a8d45106b979d1b7f53358e1dcb4 + echo "$PREFIX/usr/bin" >> $GITHUB_PATH + + - name: Build + run: swift build --swift-sdk wasm32-unknown-wasi -Xlinker -z -Xlinker stack-size=$((1024 * 1024)) # NB: 5.9 snapshot outdated, wait for release # windows: From 2740d4af8aadf551be65fcc207a037c64356e19f Mon Sep 17 00:00:00 2001 From: Stephen Celis Date: Mon, 20 Jan 2025 11:35:23 -0800 Subject: [PATCH 2/2] wip --- .github/workflows/ci.yml | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5f485e2..572857c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,23 +37,24 @@ jobs: - name: Run tests run: swift test - wasm: - name: Wasm - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: bytecodealliance/actions/wasmtime/setup@v1 - - name: Install Swift and Swift SDK for WebAssembly - run: | - PREFIX=/opt/swift - set -ex - curl -f -o /tmp/swift.tar.gz "https://download.swift.org/swift-6.0.2-release/ubuntu2204/swift-6.0.2-RELEASE/swift-6.0.2-RELEASE-ubuntu22.04.tar.gz" - sudo mkdir -p $PREFIX; sudo tar -xzf /tmp/swift.tar.gz -C $PREFIX --strip-component 1 - $PREFIX/usr/bin/swift sdk install https://github.com/swiftwasm/swift/releases/download/swift-wasm-6.0.2-RELEASE/swift-wasm-6.0.2-RELEASE-wasm32-unknown-wasi.artifactbundle.zip --checksum 6ffedb055cb9956395d9f435d03d53ebe9f6a8d45106b979d1b7f53358e1dcb4 - echo "$PREFIX/usr/bin" >> $GITHUB_PATH - - - name: Build - run: swift build --swift-sdk wasm32-unknown-wasi -Xlinker -z -Xlinker stack-size=$((1024 * 1024)) + # NB: swift-snapshot-testing needs to be updated for Wasm support + # wasm: + # name: Wasm + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v4 + # - uses: bytecodealliance/actions/wasmtime/setup@v1 + # - name: Install Swift and Swift SDK for WebAssembly + # run: | + # PREFIX=/opt/swift + # set -ex + # curl -f -o /tmp/swift.tar.gz "https://download.swift.org/swift-6.0.2-release/ubuntu2204/swift-6.0.2-RELEASE/swift-6.0.2-RELEASE-ubuntu22.04.tar.gz" + # sudo mkdir -p $PREFIX; sudo tar -xzf /tmp/swift.tar.gz -C $PREFIX --strip-component 1 + # $PREFIX/usr/bin/swift sdk install https://github.com/swiftwasm/swift/releases/download/swift-wasm-6.0.2-RELEASE/swift-wasm-6.0.2-RELEASE-wasm32-unknown-wasi.artifactbundle.zip --checksum 6ffedb055cb9956395d9f435d03d53ebe9f6a8d45106b979d1b7f53358e1dcb4 + # echo "$PREFIX/usr/bin" >> $GITHUB_PATH + # + # - name: Build + # run: swift build --swift-sdk wasm32-unknown-wasi -Xlinker -z -Xlinker stack-size=$((1024 * 1024)) # NB: 5.9 snapshot outdated, wait for release # windows: