udpate travis-ci scripts

2015-11-10 09:51:53 +08:00
parent 9c7c2d572b
commit 99ff552a74
2 changed files with 39 additions and 17 deletions
@@ -1,12 +1,22 @@
+before_cache:
+    - find $HOME/.sbt -name "*.lock" | xargs rm
+    - find $HOME/.ivy2/ -name "*.lock" | xargs rm
+
+cache:
+    directories:
+        - $HOME/.android
+        - $HOME/.ivy2/cache
+        - $HOME/.sbt/boot
+
 before_install:
- ./travis-ci/setup.sh &> /dev/null
- export NDK_CCACHE=ccache
- export ARCH=`uname -m`
- export ANDROID_NDK_HOME=`pwd`/android-ndk-r10d
- export ANDROID_HOME=`pwd`/android-sdk-linux
- export PATH=${ANDROID_NDK_HOME}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools:${PATH}
- cp local.properties.travis local.properties
+    - ./travis-ci/setup.sh &> /dev/null
+    - export NDK_CCACHE=ccache
+    - export ARCH=`uname -m`
+    - export ANDROID_NDK_HOME=$HOME/.android/android-ndk-r10d
+    - export ANDROID_HOME=$HOME/.android/android-sdk-linux
+    - export PATH=${ANDROID_NDK_HOME}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools:${PATH}
+    - cp local.properties.travis local.properties

 script:
- ./build.sh > /dev/null
- sbt android:package-release
+    - ./build.sh > /dev/null
+    - sbt android:package-release
@@ -1,15 +1,27 @@
 #!/bin/bash

+export ARCH=`uname -m`
+export ANDROID_NDK_HOME=$HOME/.android/android-ndk-r10d
+export ANDROID_HOME=$HOME/.android/android-sdk-linux
+export PATH=${ANDROID_NDK_HOME}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools:${PATH}
+
 echo "deb http://dl.bintray.com/sbt/debian /" | sudo tee -a /etc/apt/sources.list.d/sbt.list
 sudo apt-get update
 sudo apt-get install -y ccache sbt
-export ARCH=`uname -m`
-wget -q http://dl.google.com/android/android-sdk_r24.3.4-linux.tgz
-tar xf android-sdk_r24.3.4-linux.tgz
-echo "y" | android update sdk --filter
-tools,platform-tools,build-tools-23.0.1,android-23,extra-google-m2repository
+
+if [ ! -d "$ANDROID_HOME" ]
+    mkdir -p $ANDROID_HOME
+    pushd $HOME/.android
+    wget -q http://dl.google.com/android/android-sdk_r24.3.4-linux.tgz
+    tar xf android-sdk_r24.3.4-linux.tgz
+fi
+
+if [ ! -d "$ANDROID_NDK_HOME" ]
+    wget -q http://dl.google.com/android/ndk/android-ndk-r10d-linux-${ARCH}.bin
+    chmod +x android-ndk-r10d-linux-${ARCH}.bin
+    ./android-ndk-r10d-linux-${ARCH}.bin -y &> /dev/null
+fi
+
+echo "y" | android update sdk --filter tools,platform-tools,build-tools-23.0.1,android-23,extra-google-m2repository
 --no-ui -a
 echo "y" | android update sdk --filter extra-android-m2repository --no-ui -a
-wget -q http://dl.google.com/android/ndk/android-ndk-r10d-linux-${ARCH}.bin
-chmod +x android-ndk-r10d-linux-${ARCH}.bin
-./android-ndk-r10d-linux-${ARCH}.bin -y &> /dev/null