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.
This commit is contained in:
John Firebaugh
2015-05-13 15:10:26 -07:00
parent b334b7ee4e
commit 4db34bd9ef
11 changed files with 23 additions and 14 deletions

View File

@@ -5,7 +5,7 @@ set -o pipefail
mapbox_time "checkout_mason" \
git submodule update --init .mason
export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason"
PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason" \
mapbox_time "install_mesa" \
mason install mesa 10.4.3

View File

@@ -3,6 +3,8 @@
set -e
set -o pipefail
source ./scripts/linux/setup.sh
BUILDTYPE=${BUILDTYPE:-Release}
################################################################################

View File

@@ -1,7 +1,8 @@
#!/usr/bin/env bash
# This script is sourced; do not set -e or -o pipefail here.
set -e
set -o pipefail
# Ensure mason is on the PATH
export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason"
# Set the core file limit to unlimited so a core file is generated upon crash
ulimit -c unlimited -S