Commit Graph

5 Commits

Author SHA1 Message Date
John Firebaugh
4db34bd9ef 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.
2015-05-13 15:21:56 -07:00
Mike Morris
3034d9d704 Revert "Revert "Merge pull request #1429 from mapbox/travis-setup""
This reverts commit 3ccb0b5610.

Conflicts:
	.travis.yml
2015-05-12 11:51:46 -04:00
John Firebaugh
3ccb0b5610 Revert "Merge pull request #1429 from mapbox/travis-setup"
This reverts commit 9a233c7ed2, reversing
changes made to 642024af6d.
2015-05-11 22:03:46 -07:00
Mike Morris
8e15732954 drop unnecessary mason PATH and MASON_DIR exports from setup.sh 2015-05-07 16:08:10 -04:00
Mike Morris
6b90079139 break out setup.sh from run.sh
chmod +x

drop travis_helper from android and ios

source travis_helper.sh before_install

only run setup.sh if file exists

explicitly local paths

explicit if statement in before_install

source setup.sh
2015-05-07 15:50:46 -04:00