diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2015-05-13 15:10:26 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-05-13 15:21:56 -0700 |
commit | 4db34bd9efc7c54088e8bcbdf8daae760cc5cdc0 (patch) | |
tree | 0237e659dc58928edb6a3ced407e07c2d04596d5 /scripts/osx/run.sh | |
parent | b334b7ee4ef83b28635f6409db1d6ec8630da91d (diff) | |
download | qtlocation-mapboxgl-4db34bd9efc7c54088e8bcbdf8daae760cc5cdc0.tar.gz |
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.
Diffstat (limited to 'scripts/osx/run.sh')
-rwxr-xr-x | scripts/osx/run.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/osx/run.sh b/scripts/osx/run.sh index 4f086424ba..70d54c5ce9 100755 --- a/scripts/osx/run.sh +++ b/scripts/osx/run.sh @@ -3,6 +3,8 @@ set -e set -o pipefail +source ./scripts/osx/setup.sh + BUILDTYPE=${BUILDTYPE:-Release} ################################################################################ |