From 87bb926fef94b75191fefa37d15f8ad70d299813 Mon Sep 17 00:00:00 2001 From: John-David Dalton Date: Thu, 16 Jan 2014 19:54:33 -0800 Subject: [PATCH] Make the coverage run in .travis.yml use the generated modern build. --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8da4d3938..653917b67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ env: matrix: include: - node_js: "0.10" - env: ISTANBUL=true + env: ISTANBUL=true BUILD="modern" - node_js: "0.10" env: BIN="phantomjs" BUILD="compat" - node_js: "0.10" @@ -68,10 +68,10 @@ before_install: - "mkdir ./node_modules/lodash-cli/node_modules && cd ./node_modules/lodash-cli/node_modules/ && ln -s ../../../ ./lodash && cd ../ && npm i . && cd ../../" - "node ./node_modules/lodash-cli/bin/lodash $BUILD -o ./dist/lodash.$BUILD.js" script: - - "[ $ISTANBUL == false ] || (nvm use 0.11 && $BIN --harmony ./node_modules/istanbul/lib/cli.js cover -x \"**/vendor/**\" --report lcovonly ./test/test.js -- ./dist/lodash.js && nvm use 0.10 && cat ./coverage/lcov.info | coveralls && rm -rf ./coverage)" - - "([ $SAUCE_LABS == true ] || [ $BUILD == false ]) || cd ./test" - - "([ $SAUCE_LABS == true ] || [ $BUILD == false ]) || $BIN $OPTION ./test.js ../dist/lodash.$BUILD.js" - - "([ $SAUCE_LABS == true ] || [ $BUILD == false ]) || $BIN $OPTION ./test.js ../dist/lodash.$BUILD.min.js" + - "[ $ISTANBUL == false ] || (nvm use 0.11 && $BIN --harmony ./node_modules/istanbul/lib/cli.js cover -x \"**/vendor/**\" --report lcovonly ./test/test.js -- ./dist/lodash.$BUILD.js && nvm use 0.10 && cat ./coverage/lcov.info | coveralls && rm -rf ./coverage)" + - "([ $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" - "([ $SAUCE_LABS == false ] || [ $BUILD == 'underscore' ]) || $BIN ./test/saucelabs.js runner=\"test/index.html?build=lodash-$BUILD\" tags=\"$BUILD,production\"" - "([ $SAUCE_LABS == false ] || [ $COMPAT == false ]) || $BIN ./test/saucelabs.js runner=\"test/index.html?build=lodash-$BUILD\" tags=\"$BUILD,production,ie-compat\" compatMode=7" - "([ $SAUCE_LABS == false ] || [ $BUILD == 'underscore' ]) || $BIN ./test/saucelabs.js runner=\"test/index.html?build=../dist/lodash.$BUILD.js\" tags=\"$BUILD,development\""