From 0d213283c0cc7bf7ebd06210b42577c9b8dece43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= Date: Thu, 16 Oct 2014 05:56:18 -0700 Subject: [PATCH] export function to subshells --- .travis.yml | 1 + scripts/flags.sh | 2 -- scripts/travis_before_install.sh | 2 -- scripts/travis_helper.sh | 2 ++ scripts/travis_install.sh | 2 -- scripts/travis_script.sh | 2 -- 6 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5a3345971..78b2754a8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,6 +25,7 @@ env: - AWS_S3_BUCKET: 'node-mapbox-gl-native' before_install: +- source ./scripts/travis_helper.sh - source ./scripts/flags.sh - ./scripts/travis_before_install.sh diff --git a/scripts/flags.sh b/scripts/flags.sh index 83a413821..1cb8b766e 100755 --- a/scripts/flags.sh +++ b/scripts/flags.sh @@ -1,7 +1,5 @@ #!/usr/bin/env bash -. ./scripts/travis_helper.sh - if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then export DISPLAY=:99.0 diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh index 654c9dcc6..d3add138c 100755 --- a/scripts/travis_before_install.sh +++ b/scripts/travis_before_install.sh @@ -3,8 +3,6 @@ set -e set -o pipefail -. ./scripts/travis_helper.sh - if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then # # install Linux dependencies diff --git a/scripts/travis_helper.sh b/scripts/travis_helper.sh index 0a2aab663..0c54e3dd0 100755 --- a/scripts/travis_helper.sh +++ b/scripts/travis_helper.sh @@ -8,3 +8,5 @@ function mapbox_time { travis_time_finish travis_fold end "${NAME}" } + +export -f mapbox_time diff --git a/scripts/travis_install.sh b/scripts/travis_install.sh index 9d17fee7f..cb2422d70 100755 --- a/scripts/travis_install.sh +++ b/scripts/travis_install.sh @@ -1,7 +1,5 @@ #!/usr/bin/env bash -. ./scripts/travis_helper.sh - if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then # # we'll need the test suite on Linux diff --git a/scripts/travis_script.sh b/scripts/travis_script.sh index d4ebeb12d..a9c26f34f 100755 --- a/scripts/travis_script.sh +++ b/scripts/travis_script.sh @@ -3,8 +3,6 @@ set -e set -o pipefail -. ./scripts/travis_helper.sh - if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then # # build & test Linux