From 0c9ada66db72d31efe386d2a985011c7fd166eb1 Mon Sep 17 00:00:00 2001 From: Sean Mac Gillicuddy Date: Mon, 8 Jul 2019 11:31:25 +0100 Subject: [PATCH 1/2] #1214 upload debug nightlies and tagged releases to download.kiwix.org --- .travis.yml | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 42dab2f4c..2a81661cc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -70,10 +70,12 @@ after_failure: - echo " LOGCAT "; echo "========"; cat logcat.log; pkill -KILL -f adb before_deploy: -# - export APP_CHANGELOG=$(cat app/src/kiwix/play/release-notes/en-US/default.txt) - - export DATE = `date +%Y-%m-%d` - - export UNIVERSAL_APK = app/build/outputs/apk/kiwix/release/*universal*.apk - - export SSH_KEY = travis_ci_builder_id_key + # - export APP_CHANGELOG=$(cat app/src/kiwix/play/release-notes/en-US/default.txt) + - export DATE=$(date +%Y-%m-%d) + - export OUTPUT_DIR=app/build/outputs/apk/kiwix/ + - export UNIVERSAL_RELEASE_APK=$OUTPUT_DIR/release/*universal*.apk + - export UNIVERSAL_DEBUG_APK=$OUTPUT_DIR/debug/*universal*.apk + - export SSH_KEY=travis_ci_builder_id_key deploy: @@ -96,9 +98,16 @@ deploy: on: tags: true - #publish on download.kiwix.org + #publish release on download.kiwix.org - provider: script skip_cleanup: true - script: scp -vrp -i ${SSH_KEY} -o StrictHostKeyChecking=no $UNIVERSAL_APK ci@download.kiwix.org:/data/download/nightly/$DATE + script: scp -vrp -i ${SSH_KEY} -o StrictHostKeyChecking=no $UNIVERSAL_RELEASE_APK ci@download.kiwix.org:/data/download/release/kiwix-android/$TRAVIS_TAG + on: + tags: true + + #publish debug nightly on download.kiwix.org + - provider: script + skip_cleanup: true + script: scp -vrp -i ${SSH_KEY} -o StrictHostKeyChecking=no $UNIVERSAL_DEBUG_APK ci@download.kiwix.org:/data/download/nightly/$DATE on: branch: develop From 0b081b86638e189d6add2253feccbc7c87ea51ba Mon Sep 17 00:00:00 2001 From: Sean Mac Gillicuddy Date: Mon, 8 Jul 2019 14:33:13 +0100 Subject: [PATCH 2/2] #1214 fix file separators --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2a81661cc..f60769e32 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,7 +72,7 @@ after_failure: before_deploy: # - export APP_CHANGELOG=$(cat app/src/kiwix/play/release-notes/en-US/default.txt) - export DATE=$(date +%Y-%m-%d) - - export OUTPUT_DIR=app/build/outputs/apk/kiwix/ + - export OUTPUT_DIR=app/build/outputs/apk/kiwix - export UNIVERSAL_RELEASE_APK=$OUTPUT_DIR/release/*universal*.apk - export UNIVERSAL_DEBUG_APK=$OUTPUT_DIR/debug/*universal*.apk - export SSH_KEY=travis_ci_builder_id_key