From 590af1a8c15ec2c7b02f34c874001fd0f2a4931a Mon Sep 17 00:00:00 2001 From: hugovk Date: Wed, 19 Sep 2018 09:34:49 +0300 Subject: [PATCH 1/2] Retry SVN checkout to mitigate temporary network problems --- depends/install_extra_test_images.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/depends/install_extra_test_images.sh b/depends/install_extra_test_images.sh index 089a5e4d7..a43146598 100755 --- a/depends/install_extra_test_images.sh +++ b/depends/install_extra_test_images.sh @@ -3,7 +3,7 @@ rm -rf test_images -# Use SVN to just fetch a single git subdirectory -svn checkout https://github.com/python-pillow/pillow-depends/trunk/test_images +# Use SVN to just fetch a single Git subdirectory +travis_retry svn checkout https://github.com/python-pillow/pillow-depends/trunk/test_images cp -r test_images/* ../Tests/images From 549403765140933d5c89ccee18784dc710068728 Mon Sep 17 00:00:00 2001 From: Hugo Date: Wed, 19 Sep 2018 11:51:18 +0300 Subject: [PATCH 2/2] travis_retry not available in subshells/scripts --- .travis.yml | 2 +- depends/install_extra_test_images.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b5adc2da7..f7c9658bc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,7 +50,7 @@ services: - docker install: - - if [ "$DOCKER" == "" ]; then .travis/install.sh; fi + - if [ "$DOCKER" == "" ]; then travis_retry .travis/install.sh; fi before_install: - if [ "$DOCKER" ]; then travis_retry docker pull pythonpillow/$DOCKER:$DOCKER_TAG; fi diff --git a/depends/install_extra_test_images.sh b/depends/install_extra_test_images.sh index a43146598..b090800fe 100755 --- a/depends/install_extra_test_images.sh +++ b/depends/install_extra_test_images.sh @@ -4,6 +4,6 @@ rm -rf test_images # Use SVN to just fetch a single Git subdirectory -travis_retry svn checkout https://github.com/python-pillow/pillow-depends/trunk/test_images +svn checkout https://github.com/python-pillow/pillow-depends/trunk/test_images cp -r test_images/* ../Tests/images