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

Merge pull request #124 from kiwix/travis_tags_fixes 

Travis tags fixes
This commit is contained in:
Matthieu Gautier 2018-02-23 18:08:58 +01:00 committed by GitHub
parent 5f20f9939c f6c3083505
commit bef0572db5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -66,7 +66,9 @@ notifications:
on_success: change on_success: change
on_failure: always on_failure: always
addons: addons:
ssh_known_hosts: download.kiwix.org ssh_known_hosts:
- download.kiwix.org
- download.openzim.org
apt: apt:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test

7
travis/compile_all.py
View File

@ -96,7 +96,12 @@ if environ['TRAVIS_EVENT_TYPE'] != 'cron' and not make_release:
sys.exit(0) sys.exit(0)
if PLATFORM.startswith('android'): if PLATFORM.startswith('android'):
TARGETS = ('libzim', 'kiwix-lib', 'kiwix-android') if make_release:
# (For now ?) kiwix-android follow it own release process.
# Do not try to make a release of it
TARGETS = ('libzim', 'kiwix-lib')
else:
TARGETS = ('libzim', 'kiwix-lib', 'kiwix-android')
elif PLATFORM.startswith('native_'): elif PLATFORM.startswith('native_'):
TARGETS = ('libzim', 'zimwriterfs', 'zim-tools', 'kiwix-lib', 'kiwix-tools') TARGETS = ('libzim', 'zimwriterfs', 'zim-tools', 'kiwix-lib', 'kiwix-tools')
else: else:

6
travis/deploy.sh
View File

@ -17,16 +17,14 @@ then
${NIGHTLY_ARCHIVES} \ ${NIGHTLY_ARCHIVES} \
nightlybot@download.kiwix.org:/var/www/download.kiwix.org/nightly/$(date +%Y-%m-%d) nightlybot@download.kiwix.org:/var/www/download.kiwix.org/nightly/$(date +%Y-%m-%d)
fi fi
fi elif [[ "x$TRAVIS_TAG" != "x" ]]
if [[ "x$TRAVIS_TAG" != "x" ]]
then then
RELEASE_ARCHIVES=$(find $RELEASE_ARCHIVES_DIR -type f) RELEASE_ARCHIVES=$(find $RELEASE_ARCHIVES_DIR -type f)
if [[ "x$RELEASE_ARCHIVES" != "x" ]] if [[ "x$RELEASE_ARCHIVES" != "x" ]]
then then
scp -vrp -i ${SSH_KEY} \ scp -vrp -i ${SSH_KEY} \
${RELEASE_ARCHIVES} \ ${RELEASE_ARCHIVES} \
nightlybot@downoald.kiwix.org:/var/www/download.kiwix.org/releases nightlybot@download.kiwix.org:/var/www/download.kiwix.org/releases
fi fi
DIST_KIWIX_ARCHIVES=$(find $DIST_KIWIX_ARCHIVES_DIR -type f) DIST_KIWIX_ARCHIVES=$(find $DIST_KIWIX_ARCHIVES_DIR -type f)