Skip to content

Commit

Permalink
Fixing some grunt operations
Browse files Browse the repository at this point in the history
  • Loading branch information
aaronpowell committed Mar 13, 2016
1 parent b1d1524 commit 52f5c01
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
11 changes: 9 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,25 +96,32 @@ module.exports = function(grunt) {
dev: {
singleRun: false,
browsers: ['PhantomJS']
},
'dev-single': {
singleRun: true,
browsers: ['PhantomJS']
}
}
});

// load all grunt tasks
require('matchdep').filterDev('grunt-*').forEach(grunt.loadNpmTasks);
require('matchdep').filterDev(['grunt-*', '!grunt-cli']).forEach(grunt.loadNpmTasks);

grunt.registerTask('forever', function() {
this.async();
});

var devJobs = ['eslint', 'babel', 'uglify', 'clean', 'jade'];
var testJobs = devJobs.concat('connect');
if (saucekey !== null && !process.env.TRAVIS_PULL_REQUEST) {
if (saucekey && !process.env.TRAVIS_PULL_REQUEST) {
console.info('adding saucelabs integration');
testJobs.push('saucelabs-mocha');
}

if (process.env.TRAVIS_JOB_ID) {
testJobs = testJobs.concat('karma:ci');
} else {
testJobs.push('karma:dev-single');
}

grunt.registerTask('dev', devJobs);
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"karma": "^0.13.21",
"karma-mocha": "^0.2.2",
"karma-phantomjs-launcher": "^1.0.0",
"matchdep": "~0.1.2",
"matchdep": "^1.0.1",
"mocha": "^2.4.5",
"phantomjs-prebuilt": "^2.1.4"
},
Expand Down

0 comments on commit 52f5c01

Please sign in to comment.