From 6b900791390a315d104446d9b29b096db03a8fcd Mon Sep 17 00:00:00 2001
From: Mike Morris <michael.patrick.morris@gmail.com>
Date: Tue, 5 May 2015 15:54:57 -0400
Subject: break out setup.sh from run.sh

chmod +x

drop travis_helper from android and ios

source travis_helper.sh before_install

only run setup.sh if file exists

explicitly local paths

explicit if statement in before_install

source setup.sh
---
 .travis.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 2f50535cc9..dd1fb1448e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -82,14 +82,20 @@ env:
     - secure: "nQqSM8rd7OHtV4MqmNqVnkrVHqxKqQsaWRYk4/nPdhbeVWtTtkk0df711LrF1TUtbEPEewHxYUvTZ/UXmwJNeoKdzTHavI8hnatRkgjyxGERPn1il1Otelht9I+LQQHf+plrpRjVWBrNIW0Zox1B3cqn6d3NglpbXrEQ2EjYGNA="
     - KIF_SCREENSHOTS="${TRAVIS_BUILD_DIR}/screenshots"
 
+before_install:
+- source ./scripts/travis_helper.sh
+
 install:
 - ./scripts/${FLAVOR}/install.sh
 
+before_script:
+- if [ -f ./scripts/${FLAVOR}/setup.sh ]; then source ./scripts/${FLAVOR}/setup.sh; fi
+
 script:
 - ./scripts/${FLAVOR}/run.sh
 
 after_failure:
-- "[ -f scripts/${FLAVOR}/run.sh ] && scripts/${FLAVOR}/run.sh"
+- "[ -f ./scripts/${FLAVOR}/run.sh ] && ./scripts/${FLAVOR}/run.sh"
 
 notifications:
   slack:
-- 
cgit v1.2.1