This commit is contained in:
Simon Wörner
2017-04-06 16:39:47 +02:00
committed by Siegfried Kienzle
parent 6b08efc581
commit cef96956a4
3 changed files with 8 additions and 6 deletions

View File

@@ -1,4 +1,4 @@
image: scorpil/rust:stable image: scorpil/rust:nightly
stages: stages:
- test - test
@@ -10,6 +10,9 @@ cargo:test:
rustfmt: rustfmt:
stage: test stage: test
before_script:
- cargo install rustfmt
- export PATH="/root/.cargo/bin:$PATH"
script: script:
- ci/run-rustfmt.sh - ci/run-rustfmt.sh

View File

@@ -2,4 +2,6 @@ language: rust
rust: rust:
- nightly - nightly
script: script:
- true - cargo install rustfmt
- ci/run-rustfmt.sh
- ci/run-cargo-test.sh

View File

@@ -4,10 +4,7 @@ ERROR=0
while IFS= read -r -d '' f; do while IFS= read -r -d '' f; do
echo "${f}" echo "${f}"
rustfmt --write-mode=diff "$f" || ERROR=1
if [ "$(rustfmt --write-mode=diff "$f")" != $'' ] ; then
ERROR=1
fi
done < <(find . -type f -name '*.rs' -print0) done < <(find . -type f -name '*.rs' -print0)
exit ${ERROR} exit ${ERROR}