Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Commit

Permalink
Revert "Add --frozen when running cargo (#10081)" (#10105)
Browse files Browse the repository at this point in the history
* Revert "Add --frozen when running cargo (#10081)"

This reverts commit c90e279.

* Add Cargo.lock modification detection.
  • Loading branch information
tomusdrw authored and ordian committed Dec 27, 2018
1 parent 78ba54d commit bf9fedc
Showing 1 changed file with 11 additions and 4 deletions.
15 changes: 11 additions & 4 deletions test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,16 @@ validate () {
if [ "$VALIDATE" -eq "1" ]
then
echo "________Validate build________"
time cargo check $@ --frozen --no-default-features
time cargo check $@ --frozen --manifest-path util/io/Cargo.toml --no-default-features
time cargo check $@ --frozen --manifest-path util/io/Cargo.toml --features "mio"
time cargo check $@ --no-default-features
time cargo check $@ --manifest-path util/io/Cargo.toml --no-default-features
time cargo check $@ --manifest-path util/io/Cargo.toml --features "mio"

MODIFIED=$(git ls-files -m | grep Cargo.lock | wc -l)
if [ "$MODIFIED" -eq "1" ]
then
echo "Detected Cargo.lock modification. Exitting."
exit 1
fi

# Validate chainspecs
echo "________Validate chainspecs________"
Expand Down Expand Up @@ -71,7 +78,7 @@ cpp_test () {
cargo_test () {
echo "________Running Parity Full Test Suite________"
git submodule update --init --recursive
time cargo test $OPTIONS --features "$FEATURES" --frozen --all $@ -- --test-threads $THREADS
time cargo test $OPTIONS --features "$FEATURES" --all $@ -- --test-threads $THREADS
}


Expand Down

0 comments on commit bf9fedc

Please sign in to comment.