diff options
| author | Brian Ford | 2013-07-03 11:10:23 -0700 |
|---|---|---|
| committer | Igor Minar | 2013-07-11 11:38:34 -0700 |
| commit | 31631b2b2879f49b4458461b1ec1fb79d32dfb42 (patch) | |
| tree | 1549169fcd9c0e2248959f8c555146a4f5edf4f1 | |
| parent | 03216760ec858f3257e4e009a40f7f9a62b41510 (diff) | |
| download | angular.js-31631b2b2879f49b4458461b1ec1fb79d32dfb42.tar.bz2 | |
chore(build): add check for merge conflicts, ddescribe, and iit
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | Gruntfile.js | 19 | ||||
| -rw-r--r-- | package.json | 4 |
3 files changed, 23 insertions, 2 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 be5b88a3..de0d6c72 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -8,6 +8,8 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-contrib-connect'); grunt.loadNpmTasks('grunt-contrib-compress'); grunt.loadNpmTasks('grunt-contrib-jasmine-node'); + grunt.loadNpmTasks('grunt-ddescribe-iit'); + grunt.loadNpmTasks('grunt-merge-conflict'); grunt.loadNpmTasks('grunt-shell'); grunt.loadNpmTasks('grunt-parallel'); grunt.loadTasks('lib/grunt'); @@ -194,6 +196,22 @@ module.exports = function(grunt) { run: { spec: 'docs/spec' } }, + "ddescribe-iit": { + files: [ + 'test/**/*.js', + '!test/ngScenario/DescribeSpec.js' + ] + }, + + "merge-conflict": { + files: [ + 'src/**/*', + 'test/**/*', + 'docs/**/*', + 'css/**/*' + ] + }, + copy: { i18n: { files: [ @@ -225,5 +243,6 @@ module.exports = function(grunt) { grunt.registerTask('test:e2e', ['connect:testserver', 'test:end2end']); grunt.registerTask('webserver', ['connect:devserver']); grunt.registerTask('package', ['shell:bower','clean', 'buildall', 'minall', 'collect-errors', '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 3b39cea0..6ed6c68c 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,9 @@ "showdown": "0.3.1", "rewire": "1.1.3", "grunt-contrib-jasmine-node": "~0.1.1", - "grunt-parallel": "~0.2.0" + "grunt-parallel": "~0.2.0", + "grunt-ddescribe-iit": "~0.0.1", + "grunt-merge-conflict": "~0.0.1" }, "licenses": [ { |