Quellcode durchsuchen

build scripts: restore to using stable for test and clippy

Mokhtar Naamani vor 4 Jahren
Ursprung
Commit
0ad8eb24b5
4 geänderte Dateien mit 15 neuen und 7 gelöschten Zeilen
  1. 4 2
      devops/git-hooks/pre-push
  2. 1 2
      scripts/cargo-build.sh
  3. 3 3
      scripts/run-dev-chain.sh
  4. 7 0
      setup.sh

+ 4 - 2
devops/git-hooks/pre-push

@@ -2,7 +2,9 @@
 set -e
 
 echo '+cargo test --release --all'
-cargo +nightly test --release --all
+BUILD_DUMMY_WASM_BINARY=1 cargo test --release --all
 
 echo '+cargo clippy --release --all -- -D warnings'
-cargo +nightly clippy --release --all -- -D warnings
+BUILD_DUMMY_WASM_BINARY=1 cargo clippy --release --all -- -D warnings
+
+

+ 1 - 2
scripts/cargo-build.sh

@@ -1,4 +1,3 @@
 #!/bin/sh
-set -e
 
-cargo +nightly build --release
+cargo build --release

+ 3 - 3
scripts/run-dev-chain.sh

@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 
 # Build release binary
-cargo +nightly build --release -p joystream-node
+cargo build --release -p joystream-node
 
 # Purge existing local chain
-yes | cargo +nightly run --release -p joystream-node -- purge-chain --dev
+yes | cargo run --release -p joystream-node -- purge-chain --dev
 
 # Run local development chain
-cargo +nightly run --release -p joystream-node -- --dev
+cargo run --release -p joystream-node -- --dev

+ 7 - 0
setup.sh

@@ -9,7 +9,14 @@ set -e
 #  - skips installing substrate and subkey
 curl https://getsubstrate.io -sSf | bash -s -- --fast
 
+source ~/.cargo/env
+
 rustup component add rustfmt clippy
 
 # TODO: Install additional tools...
+
 # - b2sum
+# - nodejs
+# - npm
+# - yarn
+# .... ?