remove set -e, deploy on master branch only

This commit is contained in:
Andy Bauer 2017-03-05 14:02:02 -06:00
parent 42887c8c2c
commit 297e9b0463
2 changed files with 5 additions and 6 deletions

View File

@ -47,7 +47,6 @@ deploy:
provider: script provider: script
skip_cleanup: true skip_cleanup: true
script: utils/packpack/rsync_xfer.sh script: utils/packpack/rsync_xfer.sh
# Re-enable after testing is complete on:
# on: branch: master
# branch: master

View File

@ -2,9 +2,6 @@
# packpack setup file for the ZoneMinder project # packpack setup file for the ZoneMinder project
# Written by Andrew Bauer # Written by Andrew Bauer
# Required, so that Travis marks the build as failed if any of the steps below fail
set -ev
############### ###############
# SUBROUTINES # # SUBROUTINES #
############### ###############
@ -176,3 +173,6 @@ elif [ "${OS}" == "ubuntu" ] && [ "${DIST}" == "trusty" ]; then
installtrusty installtrusty
fi fi
fi fi
exit 0