summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2016-10-09 14:48:08 +0200
committerGitHub <noreply@github.com>2016-10-09 14:48:08 +0200
commitbff13f395001a76de6e67e88a0df8a326e15429b (patch)
tree384be4eac9ff05986c97c6c314b682f06c431292
parent5f7f73c6ae766342ed6a6d596f599ba63c826d7e (diff)
parentf73f554cc040507d5f28223678533fc12c9ba7cc (diff)
Merge pull request #6738 from bojidar-bg/update-travis
Attempt to fix travis builds for android
-rw-r--r--.travis.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 3c7ee5c102..d76fcca791 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -69,8 +69,8 @@ addons:
before_script:
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update; brew install scons; fi
- if [ "$TRAVIS_OS_NAME" = "osx" ] && [ "$GODOT_TARGET" = "android" ]; then
- brew update; brew install -v android-sdk;
- brew install -v android-ndk | grep -v "inflating:" | grep -v "creating:";
+ brew update; travis_wait 20 brew install -v android-sdk;
+ travis_wait 20 brew install -v android-ndk | grep -v "inflating:" | grep -v "creating:";
export ANDROID_HOME=/usr/local/opt/android-sdk; export ANDROID_NDK_ROOT=/usr/local/opt/android-ndk;
fi