aboutsummaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2017-07-03 21:07:12 -0400
committerGitHub <noreply@github.com>2017-07-03 21:07:12 -0400
commitbde1c74e57b34b3395fe4741d8188fe2704662ce (patch)
treef2e5b1b2ce8980b6ca57b2f5ee8abdf19a5cf0b2 /.travis.yml
parent8edd98fcee1506177e61ebeb31af35c7f3fb48c8 (diff)
downloadfrost-bde1c74e57b34b3395fe4741d8188fe2704662ce.tar.gz
frost-bde1c74e57b34b3395fe4741d8188fe2704662ce.tar.bz2
frost-bde1c74e57b34b3395fe4741d8188fe2704662ce.zip
Dev (#14)
* Allow file access * Log all to phone * Rework billing logic * Simplify travis process * More logging
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml6
1 files changed, 2 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index cda20a80..52a5ec31 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,12 +18,10 @@ before_install:
- tar xvf frost.tar
- chmod +x gradlew
after_success:
-- chmod +x ./generate-apk-release.sh
-# Do one or the other
-- if [[ "$TRAVIS_BRANCH" == "master" ]]; then ./gradlew app:publishApkRelease; else ./generate-apk-release.sh; fi
+- if [[ "$TRAVIS_BRANCH" != "master" ]]; then chmod +x ./generate-apk-release.sh; ./generate-apk-release.sh; fi
script:
- cd $TRAVIS_BUILD_DIR/
-- "./gradlew assembleReleaseTest"
+- if [[ "$TRAVIS_BRANCH" == "master" ]]; then ./gradlew app:publishApkRelease; else ./gradlew assembleReleaseTest; fi
notifications:
email: false
slack: