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 mips32r2

This commit is contained in:
cm8 2018-06-24 12:08:08 +02:00 committed by GitHub
parent 26e6b81924 0eb8fd1ebb
commit 673a37d56d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -43,13 +43,13 @@ deploy:
script: travis/deploy.sh
on:
tags: true
condition: $TRAVIS_OS_NAME = osx || $PLATFORM != native_dyn
condition: $TRAVIS_OS_NAME != "linux" || $DESKTOP_ONLY != 1
- provider: script
skip_cleanup: true
script: travis/deploy.sh
on:
branch: master
condition: $TRAVIS_EVENT_TYPE = cron && ($TRAVIS_OS_NAME = osx || $PLATFORM != native_dyn)
condition: $TRAVIS_EVENT_TYPE = cron && ( $TRAVIS_OS_NAME != "linux" || $DESKTOP_ONLY != 1 )
env:
global:
- NIGHTLY_DATE=$(date +%Y-%m-%d)