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

Revert "Add --frozen when running cargo (#10081)" #10105

Merged
merged 2 commits into from
Dec 27, 2018
Merged

Revert "Add --frozen when running cargo (#10081)" #10105

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
499ae25
Revert "Add --frozen when running cargo (#10081)"
tomusdrw Dec 27, 2018
f3d7d79
Add Cargo.lock modification detection.
tomusdrw Dec 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions test.sh
View file
Open in desktop
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