From e73fc9f881afefde7d8fe1076f75ff5a3cb5b611 Mon Sep 17 00:00:00 2001
From: Mygod <mygodstudio@gmail.com>
Date: Mon, 8 Aug 2016 02:48:06 +0800
Subject: [PATCH] Refine travis CI

---
 travis-ci/setup.sh => .travis-setup.sh | 7 +------
 .travis.yml                            | 3 +--
 2 files changed, 2 insertions(+), 8 deletions(-)
 rename travis-ci/setup.sh => .travis-setup.sh (78%)

diff --git a/travis-ci/setup.sh b/.travis-setup.sh
similarity index 78%
rename from travis-ci/setup.sh
rename to .travis-setup.sh
index 078c26f9..6b3dcfbb 100755
--- a/travis-ci/setup.sh
+++ b/.travis-setup.sh
@@ -1,11 +1,5 @@
 #!/bin/bash
 
-export ARCH=`uname -m`
-export GOROOT_BOOTSTRAP=$HOME/.android/go
-export ANDROID_NDK_HOME=$HOME/.android/android-ndk-r12b
-export ANDROID_HOME=$HOME/.android/android-sdk-linux
-export PATH=${ANDROID_NDK_HOME}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools:${PATH}
-
 if [ ! -d "$ANDROID_HOME" ]; then
     mkdir -p $ANDROID_HOME
     pushd $HOME/.android
@@ -32,3 +26,4 @@ fi
 
 ( sleep 5 && while [ 1 ]; do sleep 1; echo y; done ) | android update sdk --filter tools,platform-tools,build-tools-24.0.0,android-23,android-24,extra-google-m2repository --no-ui -a
 ( sleep 5 && while [ 1 ]; do sleep 1; echo y; done ) | android update sdk --filter extra-android-m2repository --no-ui -a
+cp local.properties.travis local.properties
diff --git a/.travis.yml b/.travis.yml
index 1f05bad5..e6c26094 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,14 +28,13 @@ cache:
         - $HOME/.sbt/boot
 
 install:
-    - ./travis-ci/setup.sh
     - export NDK_CCACHE=ccache
     - export ARCH=`uname -m`
     - export GOROOT_BOOTSTRAP=$HOME/.android/go
     - export ANDROID_NDK_HOME=$HOME/.android/android-ndk-r12b
     - 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
+    - ./.travis-setup.sh
 
 script:
     - sbt native-build android:package-release