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
commit 750c6aada9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -94,13 +94,13 @@ deploy:
script: travis/deploy.sh
on:
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
skip_cleanup: true
script: travis/deploy.sh
on:
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:
global:
- NIGHTLY_DATE=$(date +%Y-%m-%d)

View File

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