smallsolar
/
kiwix-build
mirror of https://github.com/kiwix/kiwix-build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix_archive_typo

This commit is contained in:
Kelson 2018-02-26 20:27:14 +01:00 committed by GitHub
parent ea54c56529 89696df3e3
commit 3180b5f761
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -33,7 +33,7 @@ deploy:
script: travis/deploy.sh script: travis/deploy.sh
on: on:
branch: master branch: master
condition: $TRAVIS_ENV_TYPE = cron condition: $TRAVIS_EVENT_TYPE = cron
env: env:
global: global:
- MATRIX_EVAL="CC=gcc-5 && CXX=g++-5" - MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"

2
travis/compile_all.py
View File

@ -168,7 +168,7 @@ elif PLATFORM == 'win32_static':
('{}.exe'.format(b) for b in kiwix_tools_bins)) ('{}.exe'.format(b) for b in kiwix_tools_bins))
elif PLATFORM == 'armhf_static': elif PLATFORM == 'armhf_static':
make_archive('kiwix-tools_armhf-{}'.format(kiwix_tools_postfix), kiwix_tools_bins) 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) APK_NAME = "kiwix-{}".format(PLATFORM)
source_debug_dir = BASE_DIR/'kiwix-android'/'app'/'build'/'outputs'/'apk'/'kiwix'/'debug' 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' source_release_dir = BASE_DIR/'kiwix-android'/'app'/'build'/'outputs'/'apk'/'kiwix'/'release'

2
travis/deploy.sh
View File

@ -24,7 +24,7 @@ then
then then
scp -vrp -i ${SSH_KEY} \ scp -vrp -i ${SSH_KEY} \
${RELEASE_ARCHIVES} \ ${RELEASE_ARCHIVES} \
nightlybot@download.kiwix.org:/var/www/download.kiwix.org/releases nightlybot@download.kiwix.org:/var/www/download.kiwix.org/release
fi fi
DIST_KIWIX_ARCHIVES=$(find $DIST_KIWIX_ARCHIVES_DIR -type f) DIST_KIWIX_ARCHIVES=$(find $DIST_KIWIX_ARCHIVES_DIR -type f)