Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[target.wasm32-wasip1]
runner = ["./scripts/wasmtime-wrapper.sh"]
14 changes: 8 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,22 @@ jobs:
- os: macos-latest
- os: ubuntu-latest
env:
CARGO_BUILD_TARGET: wasm32-wasi
CARGO_BUILD_TARGET: wasm32-wasip1
CARGO_TARGET_WASM32_WASI_RUNNER: /home/runner/.wasmtime/bin/wasmtime --dir=.
runs-on: ${{ matrix.os }}
env: ${{ matrix.env || fromJSON('{}') }}
steps:
- uses: actions/checkout@v3

- name: Install Wasm deps
if: matrix.env.CARGO_BUILD_TARGET == 'wasm32-wasi'
if: matrix.env.CARGO_BUILD_TARGET == 'wasm32-wasip1'
run: |
rustup target add wasm32-wasi
curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-20/wasi-sdk_20.0_amd64.deb
sudo dpkg --install wasi-sdk_20.0_amd64.deb
curl https://wasmtime.dev/install.sh -sSf | bash
rustup target add wasm32-wasip1
curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-25/wasi-sdk-25.0-x86_64-linux.deb
sudo dpkg --install wasi-sdk-25.0-x86_64-linux.deb
curl -LO https://github.com/bytecodealliance/wasmtime/releases/download/v13.0.0/wasmtime-v13.0.0-x86_64-linux.tar.xz
tar xvf wasmtime-v13.0.0-x86_64-linux.tar.xz
echo `pwd`/wasmtime-v13.0.0-x86_64-linux >> $GITHUB_PATH

- uses: Swatinem/rust-cache@v2
with:
Expand Down
14 changes: 8 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- os: macos-latest
- os: ubuntu-latest
env:
CARGO_BUILD_TARGET: wasm32-wasi
CARGO_BUILD_TARGET: wasm32-wasip1
CARGO_TARGET_WASM32_WASI_RUNNER: /home/runner/.wasmtime/bin/wasmtime --dir=.
runs-on: ${{ matrix.os }}
if: github.ref == 'refs/heads/main'
Expand All @@ -37,12 +37,14 @@ jobs:
persist-credentials: false

- name: Install Wasm deps
if: matrix.env.CARGO_BUILD_TARGET == 'wasm32-wasi'
if: matrix.env.CARGO_BUILD_TARGET == 'wasm32-wasip1'
run: |
rustup target add wasm32-wasi
curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-20/wasi-sdk_20.0_amd64.deb
sudo dpkg --install wasi-sdk_20.0_amd64.deb
curl https://wasmtime.dev/install.sh -sSf | bash
rustup target add wasm32-wasip1
curl -LO https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-25/wasi-sdk-25.0-x86_64-linux.deb
sudo dpkg --install wasi-sdk-25.0-x86_64-linux.deb
curl -LO https://github.com/bytecodealliance/wasmtime/releases/download/v13.0.0/wasmtime-v13.0.0-x86_64-linux.tar.xz
tar xvf wasmtime-v13.0.0-x86_64-linux.tar.xz
echo `pwd`/wasmtime-v13.0.0-x86_64-linux >> $GITHUB_PATH

- uses: Swatinem/rust-cache@v2
with:
Expand Down
Loading
Loading