Merge fd5b1b8 into 1e93523

use-ink · Apr 9, 2019 · 141e433 · 141e433
2 parents 1e93523 + fd5b1b8
commit 141e433
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/cli/src/cmd/new.rs b/cli/src/cmd/new.rs
@@ -149,7 +149,7 @@ fn build_sh_contents(name: &str) -> String {
 PROJNAME={}
 
 CARGO_INCREMENTAL=0 &&
-cargo +nightly build --release --target=wasm32-unknown-unknown --verbose &&
+cargo build --release --target=wasm32-unknown-unknown --verbose &&
 wasm2wat -o target/$PROJNAME.wat target/wasm32-unknown-unknown/release/$PROJNAME.wasm &&
 cat target/$PROJNAME.wat | sed "s/(import \"env\" \"memory\" (memory (;0;) 2))/(import \"env\" \"memory\" (memory (;0;) 2 16))/" > target/$PROJNAME-fixed.wat &&
 wat2wasm -o target/$PROJNAME.wasm target/$PROJNAME-fixed.wat &&

diff --git a/examples/core/erc20/build.sh b/examples/core/erc20/build.sh
@@ -10,7 +10,7 @@ PROJNAME=erc20
 cargo clean
 rm Cargo.lock
 
-CARGO_INCREMENTAL=0 cargo +nightly build --release --target=wasm32-unknown-unknown --verbose
+CARGO_INCREMENTAL=0 cargo build --release --target=wasm32-unknown-unknown --verbose
 wasm2wat -o target/$PROJNAME.wat target/wasm32-unknown-unknown/release/$PROJNAME.wasm
 cat target/$PROJNAME.wat | sed "s/(import \"env\" \"memory\" (memory (;0;) 2))/(import \"env\" \"memory\" (memory (;0;) 2 16))/" > target/$PROJNAME-fixed.wat
 wat2wasm -o target/$PROJNAME.wasm target/$PROJNAME-fixed.wat

diff --git a/examples/core/incrementer/build.sh b/examples/core/incrementer/build.sh
@@ -8,7 +8,7 @@
 PROJNAME=incrementer
 #cargo clean
 #rm Cargo.lock
-CARGO_INCREMENTAL=0 cargo +nightly build --release --target=wasm32-unknown-unknown --verbose
+CARGO_INCREMENTAL=0 cargo build --release --target=wasm32-unknown-unknown --verbose
 wasm2wat -o target/$PROJNAME.wat target/wasm32-unknown-unknown/release/$PROJNAME.wasm
 cat target/$PROJNAME.wat | sed "s/(import \"env\" \"memory\" (memory (;0;) 2))/(import \"env\" \"memory\" (memory (;0;) 2 16))/" > target/$PROJNAME-fixed.wat
 wat2wasm -o target/$PROJNAME.wasm target/$PROJNAME-fixed.wat

diff --git a/examples/core/noop/build.sh b/examples/core/noop/build.sh
@@ -8,7 +8,7 @@
 PROJNAME=noop
 #cargo clean
 #rm Cargo.lock
-CARGO_INCREMENTAL=0 cargo +nightly build --release --target=wasm32-unknown-unknown --verbose
+CARGO_INCREMENTAL=0 cargo build --release --target=wasm32-unknown-unknown --verbose
 wasm2wat -o target/$PROJNAME.wat target/wasm32-unknown-unknown/release/$PROJNAME.wasm
 cat target/$PROJNAME.wat | sed "s/(import \"env\" \"memory\" (memory (;0;) 2))/(import \"env\" \"memory\" (memory (;0;) 2 16))/" > target/$PROJNAME-fixed.wat
 wat2wasm -o target/$PROJNAME.wasm target/$PROJNAME-fixed.wat

diff --git a/examples/core/subpeep/build.sh b/examples/core/subpeep/build.sh
@@ -8,7 +8,7 @@
 PROJNAME=subpeep
 #cargo clean
 #rm Cargo.lock
-CARGO_INCREMENTAL=0 cargo +nightly build --release --target=wasm32-unknown-unknown --verbose
+CARGO_INCREMENTAL=0 cargo build --release --target=wasm32-unknown-unknown --verbose
 wasm2wat -o target/$PROJNAME.wat target/wasm32-unknown-unknown/release/$PROJNAME.wasm
 cat target/$PROJNAME.wat | sed "s/(import \"env\" \"memory\" (memory (;0;) 2))/(import \"env\" \"memory\" (memory (;0;) 2 16))/" > target/$PROJNAME-fixed.wat
 wat2wasm -o target/$PROJNAME.wasm target/$PROJNAME-fixed.wat

diff --git a/examples/lang/erc20/build.sh b/examples/lang/erc20/build.sh
@@ -5,7 +5,7 @@ PROJNAME=erc20
 cargo clean
 rm Cargo.lock
 
-CARGO_INCREMENTAL=0 cargo +nightly build --release --target=wasm32-unknown-unknown --verbose
+CARGO_INCREMENTAL=0 cargo build --release --target=wasm32-unknown-unknown --verbose
 wasm2wat -o target/$PROJNAME.wat target/wasm32-unknown-unknown/release/$PROJNAME.wasm
 cat target/$PROJNAME.wat | sed "s/(import \"env\" \"memory\" (memory (;0;) 2))/(import \"env\" \"memory\" (memory (;0;) 2 16))/" > target/$PROJNAME-fixed.wat
 wat2wasm -o target/$PROJNAME.wasm target/$PROJNAME-fixed.wat

diff --git a/examples/model/erc20/build.sh b/examples/model/erc20/build.sh
@@ -8,7 +8,7 @@
 PROJNAME=erc20
 #cargo clean
 #rm Cargo.lock
-CARGO_INCREMENTAL=0 cargo +nightly build --release --target=wasm32-unknown-unknown --verbose
+CARGO_INCREMENTAL=0 cargo build --release --target=wasm32-unknown-unknown --verbose
 wasm2wat -o target/$PROJNAME.wat target/wasm32-unknown-unknown/release/$PROJNAME.wasm
 cat target/$PROJNAME.wat | sed "s/(import \"env\" \"memory\" (memory (;0;) 2))/(import \"env\" \"memory\" (memory (;0;) 2 16))/" > target/$PROJNAME-fixed.wat
 wat2wasm -o target/$PROJNAME.wasm target/$PROJNAME-fixed.wat

diff --git a/examples/model/incrementer/build.sh b/examples/model/incrementer/build.sh
@@ -8,7 +8,7 @@
 PROJNAME=incrementer
 #cargo clean
 #rm Cargo.lock
-CARGO_INCREMENTAL=0 cargo +nightly build --release --target=wasm32-unknown-unknown --verbose
+CARGO_INCREMENTAL=0 cargo build --release --target=wasm32-unknown-unknown --verbose
 wasm2wat -o target/$PROJNAME.wat target/wasm32-unknown-unknown/release/$PROJNAME.wasm
 cat target/$PROJNAME.wat | sed "s/(import \"env\" \"memory\" (memory (;0;) 2))/(import \"env\" \"memory\" (memory (;0;) 2 16))/" > target/$PROJNAME-fixed.wat
 wat2wasm -o target/$PROJNAME.wasm target/$PROJNAME-fixed.wat