cut redundant builds from the travis config, fixed jenkins script

This commit is contained in:
Spencer Alger
2014-01-07 14:51:40 -07:00
parent d1e04c57fb
commit d7f12f1d86
4 changed files with 36 additions and 23 deletions

View File

@ -1,10 +1,15 @@
#!/usr/bin/env bash
# generate the latest version of the yaml-tests
./node_modules/.bin/grunt run:generate_yaml_tests --es_branch="=$ES_V"
export VERBOSE="true"
if [ -x $ES_V ]; then
echo "missing ES_V environment var"
exit 1
fi
# generate the latest version of the yaml-tests
node scripts/generate --es_branch="=$ES_V" --no-api
# unit tests
./node_modules/.bin/mocha test/unit/test_*.js \
--require should \

View File

@ -61,14 +61,19 @@ echo -en 'travis_fold:start:setup_es\\r'
fi
sleep 3
echo -en 'travis_fold:end:setup_es\\r'
echo -en 'travis_fold:end:setup_es\\r\\n'
echo -en 'travis_fold:start:install_grunt\\r'
npm install -g grunt-cli
echo -en 'travis_fold:end:install_grunt\\r'
grunt --es_branch="=$ES_BRANCH" jshint mochacov:unit run:generate_yaml_tests mochacov:integration mochacov:ship_coverage
RESULT=$?
if [ $NO_UNIT = "true" ]; then
grunt --es_branch="=$ES_BRANCH" run:generate_yaml_tests mochacov:integration
RESULT=$?
else
grunt --es_branch="=$ES_BRANCH" jshint mochacov:unit run:generate_yaml_tests mochacov:integration mochacov:ship_coverage
RESULT=$?
fi
killall java 2>/dev/null
exit $RESULT