From 6f6ffa5f87448b3e65d8d5448677dc2a57ab0528 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Mon, 26 Feb 2018 11:31:12 +0100 Subject: [PATCH 1/3] Fix typos. --- travis/deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis/deploy.sh b/travis/deploy.sh index bc01a6a..2306dc6 100755 --- a/travis/deploy.sh +++ b/travis/deploy.sh @@ -24,7 +24,7 @@ then then scp -vrp -i ${SSH_KEY} \ ${RELEASE_ARCHIVES} \ - nightlybot@download.kiwix.org:/var/www/download.kiwix.org/releases + nightlybot@download.kiwix.org:/var/www/download.kiwix.org/release fi DIST_KIWIX_ARCHIVES=$(find $DIST_KIWIX_ARCHIVES_DIR -type f) From d7dd02e9229b97607e43df02d6e8a7f15e2f82f2 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Mon, 26 Feb 2018 11:36:55 +0100 Subject: [PATCH 2/3] Do not try to deploy android apks if we are not building them. --- travis/compile_all.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis/compile_all.py b/travis/compile_all.py index a048a1d..ba2b887 100755 --- a/travis/compile_all.py +++ b/travis/compile_all.py @@ -168,7 +168,7 @@ elif PLATFORM == 'win32_static': ('{}.exe'.format(b) for b in kiwix_tools_bins)) elif PLATFORM == 'armhf_static': make_archive('kiwix-tools_armhf-{}.'.format(kiwix_tools_postfix), kiwix_tools_bins) -elif PLATFORM.startswith('android_'): +elif PLATFORM.startswith('android_') and 'kiwix-android' in TARGETS: APK_NAME = "kiwix-{}".format(PLATFORM) source_debug_dir = BASE_DIR/'kiwix-android'/'app'/'build'/'outputs'/'apk'/'kiwix'/'debug' source_release_dir = BASE_DIR/'kiwix-android'/'app'/'build'/'outputs'/'apk'/'kiwix'/'release' From ed89cbccd82d40528414753c475e169891282fd9 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Mon, 26 Feb 2018 14:33:31 +0100 Subject: [PATCH 3/3] Correct environment variable name. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index dd2969d..ebd8fc0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,7 @@ deploy: script: travis/deploy.sh on: branch: master - condition: $TRAVIS_ENV_TYPE = cron + condition: $TRAVIS_EVENT_TYPE = cron env: global: - MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"