Revert "Revert "Merge pull request #1429 from mapbox/travis-setup""

This reverts commit 3ccb0b5610.

Conflicts:
	.travis.yml
This commit is contained in:
Mike Morris
2015-05-12 11:51:46 -04:00
parent 1062121586
commit 3034d9d704
12 changed files with 40 additions and 50 deletions

View File

@@ -3,8 +3,6 @@
set -e
set -o pipefail
source ./scripts/travis_helper.sh
mapbox_time "checkout_mason" \
git submodule update --init .mason

View File

@@ -9,8 +9,6 @@ export HOST=android
export MASON_PLATFORM=android
export MASON_ANDROID_ABI=${ANDROID_ABI:-arm-v7}
source ./scripts/travis_helper.sh
# Add Mason to PATH
export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason"