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/ios/setup.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/ios/setup.sh')
| -rw-r--r-- | scripts/ios/setup.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/ios/setup.sh b/scripts/ios/setup.sh new file mode 100644 index 0000000000..d115cf9020 --- /dev/null +++ b/scripts/ios/setup.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +# This script is sourced; do not set -e or -o pipefail here. + +# Ensure mason is on the PATH +export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason" |