diff --git a/polkadot/.gitlab-ci.yml b/polkadot/.gitlab-ci.yml index 030e5fe4c006997079aac46394c9c28e0875c86f..7478a66eb8775226f552b895b8411212b0c69ab1 100644 --- a/polkadot/.gitlab-ci.yml +++ b/polkadot/.gitlab-ci.yml @@ -84,7 +84,7 @@ test-linux-stable: &test variables: - $DEPLOY_TAG script: - - ./scripts/build.sh + - ./scripts/build.sh --locked - time cargo test --all --release --verbose --locked - sccache -s @@ -107,7 +107,7 @@ build-linux-release: &build tags: - linux-docker script: - - ./scripts/build.sh + - ./scripts/build.sh --locked - time cargo build --release --verbose - mkdir -p ./artifacts - mv ./target/release/polkadot ./artifacts/. diff --git a/polkadot/ci/script.sh b/polkadot/ci/script.sh index 7eee447bb06cbf18c62fcad54a21b203ca0def64..d1d806f30f7b7a912e0d0f84c223574381d09247 100755 --- a/polkadot/ci/script.sh +++ b/polkadot/ci/script.sh @@ -17,12 +17,12 @@ case $TARGET in sudo apt-get -y update sudo apt-get install -y cmake pkg-config libssl-dev - cargo test --all --locked + cargo test --all --locked "$@" ;; "wasm") # Install prerequisites and build all wasm projects ./scripts/init.sh - ./scripts/build.sh + ./scripts/build.sh --locked "$@" ;; esac diff --git a/polkadot/runtime/wasm/Cargo.lock b/polkadot/runtime/wasm/Cargo.lock index c9d379293bf2aff3f9c905a2b5df1cdc20e4bb31..9a93cc34ea9ae86e7c42c8924eb56ff7c0300eff 100644 --- a/polkadot/runtime/wasm/Cargo.lock +++ b/polkadot/runtime/wasm/Cargo.lock @@ -2425,6 +2425,7 @@ version = "2.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#54d028551b11f40266628ceeb35bec0595d360c3" dependencies = [ "parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-session 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", diff --git a/polkadot/runtime/wasm/build.sh b/polkadot/runtime/wasm/build.sh index 068b7c8b478dd9bddadc6112d40a043d6a5ffeb1..ea87bd76fd0521da41f48438bccc63f31198e329 100755 --- a/polkadot/runtime/wasm/build.sh +++ b/polkadot/runtime/wasm/build.sh @@ -6,7 +6,7 @@ if cargo --version | grep -q "nightly"; then else CARGO_CMD="cargo +nightly" fi -RUSTFLAGS="-C link-arg=--export-table" $CARGO_CMD build --target=wasm32-unknown-unknown --release +RUSTFLAGS="-C link-arg=--export-table" $CARGO_CMD build --target=wasm32-unknown-unknown --release $@ for i in polkadot_runtime do wasm-gc target/wasm32-unknown-unknown/release/$i.wasm target/wasm32-unknown-unknown/release/$i.compact.wasm diff --git a/polkadot/scripts/build.sh b/polkadot/scripts/build.sh index 9cacf74dbb07a6ca5b135959d3e08b11a3da50a0..3135a2f4de51b0490a8163d3e31b090699f003c6 100755 --- a/polkadot/scripts/build.sh +++ b/polkadot/scripts/build.sh @@ -19,7 +19,7 @@ do echo "*** Building wasm binaries in $SRC" cd "$PROJECT_ROOT/$SRC" - ./build.sh + ./build.sh "$@" cd - >> /dev/null done diff --git a/polkadot/test-parachains/build.sh b/polkadot/test-parachains/build.sh index 06183fa2e5d8d0a884c25051203e7bfe96d2cc17..307b3e67481ecec501add4ba7b9ceddf6f6f7282 100755 --- a/polkadot/test-parachains/build.sh +++ b/polkadot/test-parachains/build.sh @@ -7,7 +7,7 @@ export RUSTFLAGS="-C link-arg=--import-memory -C link-arg=--export-table -C pani for i in adder do cd $i/wasm - cargo +nightly build --target=wasm32-unknown-unknown --release --no-default-features --target-dir target + cargo +nightly build --target=wasm32-unknown-unknown --release --no-default-features --target-dir target "$@" wasm-gc target/wasm32-unknown-unknown/release/$i'_'wasm.wasm target/wasm32-unknown-unknown/release/$i.wasm cp target/wasm32-unknown-unknown/release/$i.wasm ../../../parachain/tests/res/ rm -rf target