diff --git a/.travis.yml b/.travis.yml index 2818a5f..649e26d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,4 +23,5 @@ script: after_success: - mv deploy_key ~/.ssh/id_rsa - chmod 600 ~/.ssh/id_rsa -- '[[ $TRAVIS_PULL_REQUEST == "false" ]] && [[ $TRAVIS_BRANCH == "master" ]] && bundle exec nanoc --env=prod deploy public' +- chmod +x ./deploy.sh +- ./deploy.sh diff --git a/deploy.sh b/deploy.sh new file mode 100755 index 0000000..c7b3386 --- /dev/null +++ b/deploy.sh @@ -0,0 +1,8 @@ +#! /bin/bash +if [[ $TRAVIS_PULL_REQUEST == "false" ]]; then + if [[ $TRAVIS_BRANCH == "master" ]]; then + bundle exec nanoc --env=prod deploy public + fi +else + rsync -aglpPrtvz --delete output/ "deploy@$TRAVIS_PULL_REQUEST.zeus.werthen.com:/var/www/html/$TRAVIS_PULL_REQUEST/" +fi