aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-12-04 23:37:57 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2014-12-04 23:37:57 +0100
commitb4c5337624c278f08757bf2dd211b3e04b719bef (patch)
tree8f471ae5997e361d4e1ba803051c1a331547cfa2 /.travis.yml
parent26341a325bb225d769823259895b11339a29306f (diff)
downloadopen-keychain-b4c5337624c278f08757bf2dd211b3e04b719bef.tar.gz
open-keychain-b4c5337624c278f08757bf2dd211b3e04b719bef.tar.bz2
open-keychain-b4c5337624c278f08757bf2dd211b3e04b719bef.zip
Fix travis
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 2cf2f98f7..987c378a4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,14 +4,14 @@ before_install:
# Install base Android SDK
- sudo apt-get update -qq
- if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm lib32z1 lib32stdc++6; fi
- - wget http://dl.google.com/android/android-sdk_r23-linux.tgz
- - tar xzf android-sdk_r23-linux.tgz
+ - wget http://dl.google.com/android/android-sdk_r23.0.2-linux.tgz
+ - tar xzf android-sdk_r23.0.2-linux.tgz
- export ANDROID_HOME=$PWD/android-sdk-linux
- export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
# Install required Android components.
#- echo "y" | android update sdk -a --filter build-tools-19.1.0,android-19,platform-tools,extra-android-support,extra-android-m2repository --no-ui --force
- - ( sleep 5 && while [ 1 ]; do sleep 1; echo y; done ) | android update sdk --no-ui --all --force --filter build-tools-19.1.0,android-19,platform-tools,extra-android-support,extra-android-m2repository
+ - ( sleep 5 && while [ 1 ]; do sleep 1; echo y; done ) | android update sdk --no-ui --all --force --filter build-tools-21.1.1,android-21,platform-tools,extra-android-support,extra-android-m2repository
- ./prepare-tests.sh
install: echo "Installation done"
script: