Commit a90d575f authored by Pierre Krieger's avatar Pierre Krieger Committed by Bastian Köcher
Browse files

Require --locked on CI for WASM runtime locks (#285)

* Require --locked on CI for WASM runtime locks

* Update runtime Cargo.lock

* Add quotes
parent d6483a4f
Pipeline #40165 passed with stages
in 28 minutes and 2 seconds
...@@ -84,7 +84,7 @@ test-linux-stable: &test ...@@ -84,7 +84,7 @@ test-linux-stable: &test
variables: variables:
- $DEPLOY_TAG - $DEPLOY_TAG
script: script:
- ./scripts/build.sh - ./scripts/build.sh --locked
- time cargo test --all --release --verbose --locked - time cargo test --all --release --verbose --locked
- sccache -s - sccache -s
...@@ -107,7 +107,7 @@ build-linux-release: &build ...@@ -107,7 +107,7 @@ build-linux-release: &build
tags: tags:
- linux-docker - linux-docker
script: script:
- ./scripts/build.sh - ./scripts/build.sh --locked
- time cargo build --release --verbose - time cargo build --release --verbose
- mkdir -p ./artifacts - mkdir -p ./artifacts
- mv ./target/release/polkadot ./artifacts/. - mv ./target/release/polkadot ./artifacts/.
......
...@@ -17,12 +17,12 @@ case $TARGET in ...@@ -17,12 +17,12 @@ case $TARGET in
sudo apt-get -y update sudo apt-get -y update
sudo apt-get install -y cmake pkg-config libssl-dev sudo apt-get install -y cmake pkg-config libssl-dev
cargo test --all --locked cargo test --all --locked "$@"
;; ;;
"wasm") "wasm")
# Install prerequisites and build all wasm projects # Install prerequisites and build all wasm projects
./scripts/init.sh ./scripts/init.sh
./scripts/build.sh ./scripts/build.sh --locked "$@"
;; ;;
esac esac
...@@ -2425,6 +2425,7 @@ version = "2.0.0" ...@@ -2425,6 +2425,7 @@ version = "2.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#54d028551b11f40266628ceeb35bec0595d360c3" source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#54d028551b11f40266628ceeb35bec0595d360c3"
dependencies = [ dependencies = [
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "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-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)", "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)", "srml-session 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
......
...@@ -6,7 +6,7 @@ if cargo --version | grep -q "nightly"; then ...@@ -6,7 +6,7 @@ if cargo --version | grep -q "nightly"; then
else else
CARGO_CMD="cargo +nightly" CARGO_CMD="cargo +nightly"
fi 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 for i in polkadot_runtime
do do
wasm-gc target/wasm32-unknown-unknown/release/$i.wasm target/wasm32-unknown-unknown/release/$i.compact.wasm wasm-gc target/wasm32-unknown-unknown/release/$i.wasm target/wasm32-unknown-unknown/release/$i.compact.wasm
......
...@@ -19,7 +19,7 @@ do ...@@ -19,7 +19,7 @@ do
echo "*** Building wasm binaries in $SRC" echo "*** Building wasm binaries in $SRC"
cd "$PROJECT_ROOT/$SRC" cd "$PROJECT_ROOT/$SRC"
./build.sh ./build.sh "$@"
cd - >> /dev/null cd - >> /dev/null
done done
......
...@@ -7,7 +7,7 @@ export RUSTFLAGS="-C link-arg=--import-memory -C link-arg=--export-table -C pani ...@@ -7,7 +7,7 @@ export RUSTFLAGS="-C link-arg=--import-memory -C link-arg=--export-table -C pani
for i in adder for i in adder
do do
cd $i/wasm 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 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/ cp target/wasm32-unknown-unknown/release/$i.wasm ../../../parachain/tests/res/
rm -rf target rm -rf target
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment