Merge pull request #405 from jimmyhchan/testRelease

Fix Grunt release and don't push upstream by default (safer)

Gruntfile.js

@@ -36,6 +36,12 @@ module.exports = function(grunt) {
         options: {
           stdout: true
         }
+      },
+      gitAddArchive: {
+        command: 'git add <%= compress.distTarBall.options.archive %> <%= compress.distZip.options.archive %>',
+        options: {
+          stdout: true
+        }
       }
     },
     concat: {
@@ -162,7 +168,9 @@ module.exports = function(grunt) {
     bump: {
       options: {
         files: ['package.json', 'bower.json'],
-        updateConfigs: ['pkg']
+        updateConfigs: ['pkg'],
+        push: false,
+        commitFiles: ['-a']
       }
     },
     log: {
@@ -186,6 +194,7 @@ module.exports = function(grunt) {
           message: ['OK. Done bumping, adding, committing, tagging and pushing the new version',
                     '',
                     'You still need to manually do the following:',
+                    '  * git push upstream && git push upstream --tags',
                     '  * npm publish'].join('\n')
         }
       }
@@ -249,8 +258,8 @@ module.exports = function(grunt) {
 
   grunt.registerTask('copyForRelease', ['clean:dist', 'copy:core', 'copy:coreMin', 'copy:full', 'copy:fullMin', 'copy:license', 'log:copyForRelease']);
   grunt.registerTask('buildRelease', ['test', 'copyForRelease', 'compress']);
-  grunt.registerTask('releasePatch', ['bump-only:patch', 'buildRelease', 'bump-commit', 'log:release']);
-  grunt.registerTask('releaseMinor', ['bump-only:minor', 'buildRelease', 'bump-commit', 'log:release']);
+  grunt.registerTask('releasePatch', ['bump-only:patch', 'buildRelease', 'shell:gitAddArchive', 'bump-commit', 'log:release']);
+  grunt.registerTask('releaseMinor', ['bump-only:minor', 'buildRelease', 'shell:gitAddArchive', 'bump-commit', 'log:release']);
   // major release should probably be done with care
   // grunt.registerTask('releaseMajor', ['bump-only:major', 'buildRelease', 'bump-commit:major', 'log:release']);
 

archive/README

@@ -0,0 +1 @@
+previous build will place here.