diff options
| author | Brian Ford | 2013-07-03 11:10:23 -0700 |
|---|---|---|
| committer | Igor Minar | 2013-07-11 11:59:38 -0700 |
| commit | 93d7e60d43c23c2c7658c3f3e0d500f325083702 (patch) | |
| tree | a3eb79e903e67304cdda387a5ee415ed15f68cce | |
| parent | 338264b5f6964999d36b4889fed95464a1f0fa84 (diff) | |
| download | angular.js-93d7e60d43c23c2c7658c3f3e0d500f325083702.tar.bz2 | |
chore(build): add check for merge conflicts, ddescribe, and iit
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | Gruntfile.js | 20 | ||||
| -rw-r--r-- | package.json | 2 |
3 files changed, 23 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 3b439f7c..cce23318 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ before_script: - export SAUCE_ACCESS_KEY=`echo $SAUCE_ACCESS_KEY | rev` - ./lib/sauce/sauce_connect_setup.sh - npm install -g grunt-cli - - grunt package + - grunt ci-checks package - ./lib/sauce/sauce_connect_block.sh script: diff --git a/Gruntfile.js b/Gruntfile.js index 9a470d3d..404dc52f 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -7,6 +7,8 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-contrib-copy'); grunt.loadNpmTasks('grunt-contrib-connect'); grunt.loadNpmTasks('grunt-contrib-compress'); + grunt.loadNpmTasks('grunt-ddescribe-iit'); + grunt.loadNpmTasks('grunt-merge-conflict'); grunt.loadNpmTasks('grunt-parallel'); grunt.loadTasks('lib/grunt'); @@ -169,6 +171,23 @@ module.exports = function(grunt) { }, + "ddescribe-iit": { + files: [ + 'test/**/*.js', + '!test/ngScenario/DescribeSpec.js' + ] + }, + + "merge-conflict": { + files: [ + 'src/**/*', + 'test/**/*', + 'docs/**/*', + 'css/**/*' + ] + }, + + copy: { i18n: { files: [ @@ -199,5 +218,6 @@ module.exports = function(grunt) { grunt.registerTask('test:e2e', ['connect:testserver', 'test:end2end']); grunt.registerTask('webserver', ['connect:devserver']); grunt.registerTask('package', ['clean', 'buildall', 'minall', 'docs', 'copy', 'write', 'compress']); + grunt.registerTask('ci-checks', ['ddescribe-iit', 'merge-conflict']); grunt.registerTask('default', ['package']); }; diff --git a/package.json b/package.json index 4cc95603..a7f1d886 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,8 @@ "grunt-contrib-connect": "0.1.2", "grunt-contrib-copy": "0.4.1", "grunt-parallel": "~0.2.0", + "grunt-ddescribe-iit": "~0.0.1", + "grunt-merge-conflict": "~0.0.1", "jasmine-node": "1.2.3", "q": "~0.9.2", "q-fs": "0.1.36", |