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 #330 from kiwix/fix_deploy 

Fix deploy
This commit is contained in:
Matthieu Gautier 2019-05-31 00:16:47 +02:00 committed by GitHub
parent b90f32e9bf 629fccb327
commit 750c6aada9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -94,13 +94,13 @@ deploy:
script: travis/deploy.sh script: travis/deploy.sh
on: on:
tags: true tags: true
condition: $TRAVIS_BUILD_STAGE_NAME != "Build_docker_images" && ($TRAVIS_OS_NAME != "linux" || $DESKTOP_ONLY != 1) condition: $TRAVIS_BUILD_STAGE_NAME != "Build_docker_images"
- 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_BUILD_STAGE_NAME != "Build_docker_images" && $TRAVIS_EVENT_TYPE = cron && ( $TRAVIS_OS_NAME != "linux" || $DESKTOP_ONLY != 1 ) condition: $TRAVIS_BUILD_STAGE_NAME != "Build_docker_images" && $TRAVIS_EVENT_TYPE = cron
env: env:
global: global:
- NIGHTLY_DATE=$(date +%Y-%m-%d) - NIGHTLY_DATE=$(date +%Y-%m-%d)

2
travis/deploy.sh
View File

@ -70,7 +70,7 @@ then
fi fi
cd ${EXPORT_DIR}/GIT cd ${EXPORT_DIR}/GIT
GIT_REPOS=$(ls -d */) GIT_REPOS=$(ls -l | awk '/^d/ { print $9 }')
if [[ "x$GIT_REPOS" != "x" ]] if [[ "x$GIT_REPOS" != "x" ]]
then then
for repo in $GIT_REPOS for repo in $GIT_REPOS