upgrade grunt-esvm

This commit is contained in:
Spencer Alger
2015-01-11 20:51:08 -07:00
parent 9923668dce
commit 22e25ef77a
5 changed files with 6 additions and 5 deletions

1
.gitignore vendored
View File

@ -5,6 +5,7 @@ scripts/scratch*
test/integration/yaml_suite/log
.aws-config.json
.idea
.esvm
## generated files
test/integration/yaml_suite/yaml_tests*.json

View File

@ -2,7 +2,8 @@ language: node_js
node_js: "0.10"
secure: "UFAGQ6m/VnEahbj9vttY9YoA5h5rEBE6K7AvEEbWnt+VKppV+w3hu3HZxgKr8C9PWhCzqlGvsLh+kCqykZhISU1fBCK/Ttp3nSpMvvF5tI2u51Rj1qZ/7NUGRU0qVI9KFt0rJeXMJwq3fivb1H6aojfPD1gsIte7NHNjUfd0iUg="
env:
- ES_RELEASE=1.4.2 RUN=NODE_INTEGRATION,NODE_UNIT,CHECK_COVERAGE
- ES_RELEASE=1.4.2 RUN=NODE_INTEGRATION
- ES_RELEASE=1.4.2 RUN=NODE_UNIT,CHECK_COVERAGE
- ES_RELEASE=1.4.2 RUN=SAUCE_LABS
- ES_RELEASE=1.3.7 RUN=NODE_INTEGRATION
- ES_RELEASE=1.2.4 RUN=NODE_INTEGRATION

View File

@ -5,7 +5,7 @@ var join = require('path').join;
var defaultOpts = {
directory: join(__dirname, '..', '..', '.esvm'),
nodes: 1,
quiet: true,
quiet: false,
config: {
'node.name': 'elasticsearch_js_test_runner',
'cluster.name': 'elasticsearch_js_test_runners',

View File

@ -53,7 +53,7 @@
"grunt-contrib-jshint": "spenceralger/grunt-contrib-jshint",
"grunt-contrib-uglify": "~0.2.7",
"grunt-contrib-watch": "~0.5.3",
"grunt-esvm": "~0.3.0",
"grunt-esvm": "~0.3.2",
"grunt-mocha-cov": "~0.2.0",
"grunt-open": "~0.2.2",
"grunt-prompt": "~0.1.2",
@ -82,7 +82,6 @@
"dependencies": {
"bluebird": "~2.2.2",
"forever-agent": "~0.5.2",
"grunt-esvm": "~0.3.1",
"lodash-node": "~2.4"
},
"repository": {

View File

@ -28,7 +28,7 @@ var format = require('util').format;
var NL_RE = /(\r?\n)/g;
var ROOT = join(__dirname, '..');
var GRUNT = join(ROOT, './node_modules/.bin/grunt');
var GRUNT = join(ROOT, 'node_modules', '.bin', 'grunt');
var ENV = _.clone(process.env);
var JENKINS = !!ENV.JENKINS_HOME;
var TASKS = [];