about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAidan Hobson Sayers <aidanhs@cantab.net>2017-01-14 03:10:45 +0000
committerAidan Hobson Sayers <aidanhs@cantab.net>2017-01-14 03:10:45 +0000
commit7b6c2cbe567ee2c613677c1c1c076be9ecbc5c3a (patch)
tree19371b57ce9e3fdefabdef6c068d5ac830d44b8d
parentb0c52c587fe9ba287053359fff5ed886b7edb27c (diff)
downloadrust-7b6c2cbe567ee2c613677c1c1c076be9ecbc5c3a.tar.gz
rust-7b6c2cbe567ee2c613677c1c1c076be9ecbc5c3a.zip
If submodule init fails, try from scratch
-rw-r--r--.travis.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 505795d33e5..4f9148ede34 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -71,10 +71,10 @@ script:
       if [ "$ALLOW_PR" = "" ] && [ "$TRAVIS_BRANCH" != "auto" ]; then
           echo skipping, not a full build;
       elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
-          travis_retry git submodule update --init &&
+          travis_retry sh -c 'git submodule deinit -f . && git submodule update --init' &&
           src/ci/run.sh;
       else
-          travis_retry git submodule update --init &&
+          travis_retry sh -c 'git submodule deinit -f . && git submodule update --init' &&
           src/ci/docker/run.sh $IMAGE;
       fi