From ba56f95da8ef4279b5ee2f0d074ecf8f70889ad6 Mon Sep 17 00:00:00 2001 From: John-David Dalton Date: Fri, 11 Jul 2014 09:18:35 -0700 Subject: [PATCH] Use `TRAVIS_SECURE_ENV_VARS` instead of `TRAVIS_PULL_REQUEST`. --- .travis.yml | 2 +- test/saucelabs.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 540085204..b75d5f96b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,7 +45,7 @@ before_install: - "node ./node_modules/lodash-cli/bin/lodash $BUILD -o ./dist/lodash.$BUILD.js" script: - "[ $ISTANBUL == false ] || (nvm install 0.11.11 && $BIN --harmony ./node_modules/istanbul/lib/cli.js cover -x \"**/vendor/**\" --report lcovonly ./test/test.js -- ./dist/lodash.$BUILD.js)" - - "[ $ISTANBUL == true ] && [ $TRAVIS_PULL_REQUEST == false ] && nvm use 0.10 && cat ./coverage/lcov.info | coveralls && rm -rf ./coverage || true" + - "[ $ISTANBUL == true ] && [ $TRAVIS_SECURE_ENV_VARS == true ] && nvm use 0.10 && cat ./coverage/lcov.info | coveralls && rm -rf ./coverage || true" - "([ $SAUCE_LABS == true ] || [ $ISTANBUL == true ]) || cd ./test" - "([ $SAUCE_LABS == true ] || [ $ISTANBUL == true ]) || $BIN $OPTION ./test.js ../dist/lodash.$BUILD.js" - "([ $SAUCE_LABS == true ] || [ $ISTANBUL == true ]) || $BIN $OPTION ./test.js ../dist/lodash.$BUILD.min.js" diff --git a/test/saucelabs.js b/test/saucelabs.js index 45e2b0b8c..eb0101af0 100644 --- a/test/saucelabs.js +++ b/test/saucelabs.js @@ -4,8 +4,8 @@ /** Environment shortcut */ var env = process.env; -if (isFinite(env.TRAVIS_PULL_REQUEST)) { - console.log('Skipping Sauce Labs jobs for pull requests'); +if (env.TRAVIS_SECURE_ENV_VARS == 'false') { + console.log('Skipping Sauce Labs jobs; secure environment variables are unavailable'); process.exit(0); }