Rollup merge of #38655 - alexcrichton:travis-and-then, r=brson

travis: Use `&&` intead of `;`

Show errors sooner and try not to hide them behind lots of other walls of text.
This commit is contained in:
Alex Crichton 2016-12-29 17:26:31 -08:00 committed by GitHub
commit 031aa58d24

View File

@ -67,10 +67,10 @@ script:
if [ "$ALLOW_PR" = "" ] && [ "$TRAVIS_BRANCH" != "auto" ]; then
echo skipping, not a full build;
elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
git submodule update --init;
git submodule update --init &&
src/ci/run.sh;
else
git submodule update --init;
git submodule update --init &&
src/ci/docker/run.sh $IMAGE;
fi