diff options
| author | bors <bors@rust-lang.org> | 2017-01-15 13:00:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-01-15 13:00:49 +0000 |
| commit | 20ba64d2b4b3282ec64fea9d08ed9a71d22e820a (patch) | |
| tree | 381212d652ec3ea11dc3cba872bff2c3c21a3f2e | |
| parent | 7a526ca05a6a1223429ee4f3de6260f0e5a2b24a (diff) | |
| parent | 7b6c2cbe567ee2c613677c1c1c076be9ecbc5c3a (diff) | |
| download | rust-20ba64d2b4b3282ec64fea9d08ed9a71d22e820a.tar.gz rust-20ba64d2b4b3282ec64fea9d08ed9a71d22e820a.zip | |
Auto merge of #39055 - aidanhs:aphs-deinit-before-init, r=alexcrichton
If submodule init fails, try from scratch See #39051 I wonder if the cause could be some strange not-quite-checked-out state in a submodule. Try and fix this by force deinitialising everything before initialising (this will not throw away downloaded objects, git will skip them on the next attempt at cloning). r? @alexcrichton
| -rw-r--r-- | .travis.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 6cb2b802147..e5eb6d6232f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -86,10 +86,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 |