diff --git a/wasmtest/contracts-rust/travis.build.sh b/wasmtest/contracts-rust/travis.build.sh index dba9a83aa..250b880d0 100644 --- a/wasmtest/contracts-rust/travis.build.sh +++ b/wasmtest/contracts-rust/travis.build.sh @@ -13,7 +13,7 @@ do [[ -d $dir ]] && { cd $dir echo $dir - RUSTFLAGS="-C link-arg=-zstack-size=32768" cargo build --release --target=wasm32-unknown-unknown + RUSTFLAGS="-C target-cpu=mvp -C link-arg=-zstack-size=32768" cargo build -Zbuild-std=panic_abort,core,alloc --release --target wasm32-unknown-unknown cd .. } done diff --git a/wasmtest/gha-run-wasm-tests.sh b/wasmtest/gha-run-wasm-tests.sh index 1975e7492..dc989a5f2 100644 --- a/wasmtest/gha-run-wasm-tests.sh +++ b/wasmtest/gha-run-wasm-tests.sh @@ -5,27 +5,21 @@ set -x # install build tools # ensure clang -wget releases.llvm.org/9.0.0/clang+llvm-9.0.0-x86_64-linux-gnu-ubuntu-18.04.tar.xz > /dev/null -tar xf clang+llvm-9.0.0-x86_64-linux-gnu-ubuntu-18.04.tar.xz > /dev/null 2>&1 -export PATH="$(pwd)/clang+llvm-9.0.0-x86_64-linux-gnu-ubuntu-18.04/bin":$PATH - -RUST_VERSION=nightly-2022-12-07 +RUST_VERSION=nightly-2025-03-11 # ensure rust curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $RUST_VERSION source $HOME/.cargo/env - rustup default $RUST_VERSION rustup target add wasm32-unknown-unknown +rustup component add rust-src which ontio-wasm-build || cargo install --git=https://github.com/ontio/ontio-wasm-build # build rust wasm contracts mkdir -p testwasmdata cd contracts-rust && bash travis.build.sh && cd ../ -cd contracts-cplus && bash travis.build.bash && cd ../ - # verify and optimize wasm contract for wasm in testwasmdata/*.wasm ; do ontio-wasm-build $wasm $wasm