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 #320 from kiwix/fix_deploy_build_docker 

Do not try to deploy things when we are building docker images.
This commit is contained in:
Matthieu Gautier 2019-05-07 13:18:46 +02:00 committed by GitHub
parent 8fe54b9f96 bf5e378963
commit bc5f0a5050
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

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