diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1ed3a57..216b248 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -122,18 +122,18 @@ jobs: - name: Install rust-src run: rustup component add rust-src - name: Test with panic backend (debug) - run: LITHIUM_BACKEND=panic ./cargo-wasi test --target wasm32-wasip1 + run: LITHIUM_BACKEND=panic ci/cargo-wasi test --target wasm32-wasip1 - name: Test with Itanium backend (debug) - run: LITHIUM_BACKEND=itanium ./cargo-wasi test --target wasm32-wasip1 + run: LITHIUM_BACKEND=itanium ci/cargo-wasi test --target wasm32-wasip1 - name: Test without std (debug) - run: ./cargo-wasi test --target wasm32-wasip1 --no-default-features + run: ci/cargo-wasi test --target wasm32-wasip1 --no-default-features # XXX: Upstream bug at https://github.com/rust-lang/rust/issues/132416 # - name: Test with panic backend (release) - # run: LITHIUM_BACKEND=panic ./cargo-wasi test --target wasm32-wasip1 --release + # run: LITHIUM_BACKEND=panic ci/cargo-wasi test --target wasm32-wasip1 --release # - name: Test with Itanium backend (release) - # run: LITHIUM_BACKEND=itanium ./cargo-wasi test --target wasm32-wasip1 --release + # run: LITHIUM_BACKEND=itanium ci/cargo-wasi test --target wasm32-wasip1 --release # - name: Test without std (release) - # run: ./cargo-wasi test --target wasm32-wasip1 --release --no-default-features + # run: ci/cargo-wasi test --target wasm32-wasip1 --release --no-default-features darwin: runs-on: ${{ matrix.os }} diff --git a/cargo-wasi b/cargo-wasi deleted file mode 100755 index 5040826..0000000 --- a/cargo-wasi +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash -export RUSTFLAGS="$RUSTFLAGS -C panic=unwind" -export CARGO_TARGET_WASM32_WASIP1_RUNNER="node --no-warnings wasi.mjs preview1" -export CARGO_TARGET_WASM32_WASIP2_RUNNER="node --no-warnings wasi.mjs preview2" -exec cargo -Z build-std=core,std "$@" diff --git a/ci/cargo-wasi b/ci/cargo-wasi new file mode 100755 index 0000000..b358646 --- /dev/null +++ b/ci/cargo-wasi @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +export RUSTFLAGS="$RUSTFLAGS -C panic=unwind" +export CARGO_TARGET_WASM32_WASIP1_RUNNER="$(printf "node --no-warnings %q preview1" "$(dirname "$0")/wasi.mjs")" +export CARGO_TARGET_WASM32_WASIP2_RUNNER="$(printf "node --no-warnings %q preview2" "$(dirname "$0")/wasi.mjs")" +exec cargo -Z build-std=core,std "$@" diff --git a/wasi.mjs b/ci/wasi.mjs similarity index 100% rename from wasi.mjs rename to ci/wasi.mjs