Skip to content

Commit 87b3136

Browse files
committed
feat(gen): update release task for current workflow
1 parent 940a7c6 commit 87b3136

File tree

2 files changed

+39
-28
lines changed

2 files changed

+39
-28
lines changed

Gruntfile.js

Lines changed: 39 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
'use strict';
22

3-
var semver = require('semver');
43
var shell = require('shelljs');
54
var child_process = require('child_process');
65
var Q = require('q');
@@ -28,15 +27,26 @@ module.exports = function (grunt) {
2827
},
2928
release: {
3029
options: {
30+
bump: false, // remove after 3.0.0 release
3131
commitMessage: '<%= version %>',
32-
tagName: 'v<%= version %>',
33-
bump: false, // we have our own bump
34-
file: 'package.json'
32+
tagName: '<%= version %>',
33+
file: 'package.json',
34+
afterBump: ['updateFixtures:deps', 'commitNgFullstackDeps'],
35+
beforeRelease: ['stage'],
36+
push: false,
37+
pushTags: false,
38+
npm: false
39+
}
40+
},
41+
commitNgFullstackDeps: {
42+
options: {
43+
cwd: 'angular-fullstack-deps',
44+
files: ['package.json', 'bower.json']
3545
}
3646
},
3747
stage: {
3848
options: {
39-
files: ['CHANGELOG.md']
49+
files: ['CHANGELOG.md', 'angular-fullstack-deps']
4050
}
4151
},
4252
buildcontrol: {
@@ -103,32 +113,34 @@ module.exports = function (grunt) {
103113
}
104114
});
105115

106-
grunt.registerTask('bump', 'bump manifest version', function (type) {
107-
var options = this.options({
108-
file: grunt.config('pkgFile') || 'package.json'
109-
});
110-
111-
function setup(file, type) {
112-
var pkg = grunt.file.readJSON(file);
113-
var newVersion = pkg.version = semver.inc(pkg.version, type || 'patch');
114-
return {
115-
file: file,
116-
pkg: pkg,
117-
newVersion: newVersion
118-
};
119-
}
120-
121-
var config = setup(options.file, type);
122-
grunt.file.write(config.file, JSON.stringify(config.pkg, null, ' ') + '\n');
123-
grunt.log.ok('Version bumped to ' + config.newVersion);
124-
});
125-
126116
grunt.registerTask('stage', 'git add files before running the release task', function () {
127-
var files = this.options().files;
117+
var files = grunt.config('stage.options').files, done = this.async();
128118
grunt.util.spawn({
129119
cmd: process.platform === 'win32' ? 'git.cmd' : 'git',
130120
args: ['add'].concat(files)
131-
}, grunt.task.current.async());
121+
}, done);
122+
});
123+
124+
grunt.registerTask('commitNgFullstackDeps', function() {
125+
grunt.config.requires(
126+
'commitNgFullstackDeps.options.files',
127+
'commitNgFullstackDeps.options.cwd'
128+
);
129+
var ops = grunt.config.get('commitNgFullstackDeps').options;
130+
var version = require('./package.json').version || 'NO VERSION SET';
131+
if (Array.isArray(ops.files) && ops.files.length > 0) {
132+
var done = this.async();
133+
var cwd = path.resolve(__dirname, ops.cwd);
134+
grunt.util.spawn({
135+
cmd: process.platform === 'win32' ? 'git.cmd' : 'git',
136+
args: ['commit', '-m', version].concat(ops.files),
137+
opts: {
138+
cwd: cwd
139+
}
140+
}, done);
141+
} else {
142+
grunt.log.writeln('No files were commited');
143+
}
132144
});
133145

134146
grunt.registerTask('generateDemo', 'generate demo', function () {

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
"mocha": "^2.2.5",
5555
"q": "^1.0.1",
5656
"recursive-readdir": "^1.2.0",
57-
"semver": "^5.0.1",
5857
"shelljs": "^0.5.3",
5958
"underscore.string": "^3.1.1"
6059
},

0 commit comments

Comments
 (0)