From 3c72ea40b4ae3acf2c61454553bd23dab5339338 Mon Sep 17 00:00:00 2001 From: John-David Dalton Date: Thu, 19 Dec 2013 23:06:01 -0800 Subject: [PATCH] Use node --harmony for code coverage tests. --- .travis.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 56d8233e8..ea8a35b0b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ node_js: - "0.10" env: global: - - BIN="node" BUILD=false COMPAT=false MAKE=false OPTION="" SAUCE_LABS=false SAUCE_USERNAME="lodash" + - BIN="node" BUILD=false COMPAT=false ISTANBUL=false MAKE=false OPTION="" SAUCE_LABS=false SAUCE_USERNAME="lodash" - secure: "tg1JFsIFnxzLaTboFPOnm+aJCuMm5+JdhLlESlqg9x3fwro++7KCnwHKLNovhchaPe4otC43ZMB/nfWhDnDm11dKbm/V6HlTkED+dadTsaLxVDg6J+7yK41QhokBPJOxLV78iDaNaAQVYEirAgZ0yn8kFubxmNKV+bpCGQNc9yU=" matrix: - BUILD="compat" @@ -15,7 +15,7 @@ env: matrix: include: - node_js: "0.10" - env: BIN="istanbul" + env: ISTANBUL=true - node_js: "0.10" env: BIN="phantomjs" BUILD="compat" - node_js: "0.10" @@ -57,7 +57,7 @@ before_install: - "([ $BUILD == 'legacy' ] || [ $BUILD == 'mobile' ] || [ $BUILD == 'modern' ]) && MAKE=true || true" - "([ $BUILD == 'compat' ] || [ $BUILD == 'legacy' ]) && COMPAT=true || true" - "[ $SAUCE_LABS == false ] || npm i ecstatic@\"~0.4.0\" request@\"~2.27.0\" sauce-tunnel@\"~1.1.0\"" - - "[ $BIN != 'istanbul' ] || npm i -g coveralls@\"~2.5.0\" istanbul@\"~0.1.0\"" + - "[ $ISTANBUL == false ] || npm i -g coveralls@\"~2.5.0\" && npm i istanbul@\"~0.1.0\" && nvm install v0.11.9" - "[ $BIN != 'narwhal' ] || (wget https://github.com/280north/narwhal/archive/v0.3.2.zip && sudo unzip v0.3.2 -d /opt/ && rm v0.3.2.zip)" - "[ $BIN != 'narwhal' ] || (sudo ln -s /opt/narwhal-0.3.2/bin/narwhal /usr/local/bin/narwhal && sudo chmod +x /usr/local/bin/narwhal)" - "[ $BIN != 'rhino' ] || (sudo mkdir /opt/rhino-1.7R5 && sudo wget -O /opt/rhino-1.7R5/js.jar https://oss.sonatype.org/content/repositories/snapshots/org/mozilla/rhino/1.7R5-SNAPSHOT/rhino-1.7R5-20120629.144839-4.jar)" @@ -68,10 +68,10 @@ before_install: - "[ $MAKE == false ] || (mkdir ./node_modules/lodash-cli/node_modules && cd ./node_modules/lodash-cli/node_modules/ && ln -s ../../../ ./lodash && cd ../ && npm i . && cd ../../)" - "[ $MAKE == false ] || node ./node_modules/lodash-cli/bin/lodash $BUILD -o ./dist/lodash.$BUILD.js" script: - - "[ $BIN != 'istanbul' ] || ($BIN cover -x \"**/vendor/**\" --report lcovonly ./test/test.js -- ./dist/lodash.js && 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 v0.11.9 && $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" - "([ $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\""