diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index ddcc6ee61..8448d5571 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -246,8 +246,8 @@ jobs: uses: actions/checkout@v4 - name: "Select toolchain" uses: dtolnay/rust-toolchain@stable - - name: "Run test script" - run: ./contrib/run_task.sh wasm + - name: "Run wasm script" + run: cd hashes && ./contrib/wasm.sh Schemars: # hashes crate only. name: Schemars - stable toolchain diff --git a/contrib/run_task.sh b/contrib/run_task.sh index f74dacf83..2bb10dddc 100755 --- a/contrib/run_task.sh +++ b/contrib/run_task.sh @@ -90,11 +90,6 @@ main() { do_bench ;; - wasm) - # hashes crate only. - do_wasm - ;; - asan) # hashes crate only - hashes/contrib/test_vars.sh is sourced in this function. do_asan @@ -259,20 +254,6 @@ do_bench() { done } -# Note we do not use the recent lock file or `--locked` when running the wasm tests. -do_wasm() { - pushd "$REPO_DIR/hashes" > /dev/null - - clang --version && - CARGO_TARGET_DIR=wasm cargo install --force wasm-pack && - printf '\n[target.wasm32-unknown-unknown.dev-dependencies]\nwasm-bindgen-test = "0.3"\n' >> Cargo.toml && - printf '\n[lib]\ncrate-type = ["cdylib", "rlib"]\n' >> Cargo.toml && - CC=clang-9 wasm-pack build && - CC=clang-9 wasm-pack test --node; - - popd > /dev/null -} - do_asan() { pushd "$REPO_DIR/hashes" > /dev/null diff --git a/hashes/contrib/wasm.sh b/hashes/contrib/wasm.sh new file mode 100755 index 000000000..6139e3078 --- /dev/null +++ b/hashes/contrib/wasm.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash +# +# Run the WASM tests. + +set -euox pipefail + +clang --version && + CARGO_TARGET_DIR=wasm cargo install --force wasm-pack && + printf '\n[target.wasm32-unknown-unknown.dev-dependencies]\nwasm-bindgen-test = "0.3"\n' >> Cargo.toml && + printf '\n[lib]\ncrate-type = ["cdylib", "rlib"]\n' >> Cargo.toml && + CC=clang-9 wasm-pack build && + CC=clang-9 wasm-pack test --node;