From 4db34bd9efc7c54088e8bcbdf8daae760cc5cdc0 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 13 May 2015 15:10:26 -0700 Subject: Don't do things that set -e in Travis's shell Sourcing files that set flags bleed into Travis' wrapper script, which messes with their workflow, e.g. preventing after_failure scripts from triggering. These changes fix that: * Move exported variables from install.sh to setup.sh, so install.sh doesn't have to be sourced. * Source setup.sh from run.sh, rather than directly from .travis.yml. In addition, as a good practice, remove `set -e` etc. from setup.sh, and add a comment not to add them back. It's the sourcing script's responsibility to set these flags. --- .travis.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 73ac6ec5a5..770d9325fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -86,10 +86,7 @@ before_install: - source ./scripts/travis_helper.sh install: -- source ./scripts/${FLAVOR}/install.sh - -before_script: -- if [ -f ./scripts/${FLAVOR}/setup.sh ]; then source ./scripts/${FLAVOR}/setup.sh; fi +- ./scripts/${FLAVOR}/install.sh script: - ./scripts/${FLAVOR}/run.sh -- cgit v1.2.1