Merge "[NoStory] fixing the CI (missed build/gz3d.js -.-)"

gz3d/utils/Gruntfile.js

@@ -92,6 +92,14 @@ module.exports = function(grunt) {
         files: {
           src: ['package.json', '../../bower.json']
         }
+      },
+      dist: {
+        options: {
+          force: true
+        },
+        files: {
+          src: ['../build/gz3d.js']
+        }
       }
     },
 
@@ -104,6 +112,14 @@ module.exports = function(grunt) {
         files: {
           src: ['package.json', '../../bower.json']
         }
+      },
+      dist: {
+        options: {
+          ignoreEmpty: true,
+        },
+        files: {
+          src: ['../build/gz3d.js']
+        }
       }
     },
 
@@ -124,6 +140,13 @@ module.exports = function(grunt) {
           branch: 'HEAD:<%= gerritBranch %>',
           tags: true
         }
+      },
+      dist: {
+        options: {
+          verbose: true, // for debug purpose
+          remote: 'origin',
+          branch: 'HEAD:<%= gerritBranch %>'
+        }
       }
     },
 
@@ -143,15 +166,17 @@ module.exports = function(grunt) {
   grunt.registerTask('doc', ['clean', 'jsdoc']);
 
   grunt.registerTask('ci', 'Run all the build steps on the CI server', function(target) {
-    var tasks = ['concat', 'jshint', 'uglify'];
+    var tasks = ['concat', 'jshint', 'uglify', 'gitadd:dist', 'gitcommit:dist', 'gitpush:dist'];
     var branch = this.options().gerritBranch;
     grunt.log.writeln('[grunt ci:' + target + '] GERRIT_BRANCH is: ' + branch);
     if (target === 'patch' || target === 'minor' || target === 'major') {
+      // commit bumped version numbers
       tasks.unshift('bump:' + target);
       tasks.push('gitadd:bump');
       tasks.push('gitcommit:bump');
       tasks.push('gitpush:bump');
 
+      // commit git tag
       tasks.push('gittag:dist');
       tasks.push('gitpush:bump');
     }