Skip to content

Commit 2bc07df

Browse files
committed
Address some feedback
1 parent ef0ecaa commit 2bc07df

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

lib/promote_release.js

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,13 @@ class ReleasePromotion {
116116
// There will be cherry-pick conflicts the Releaser will
117117
// need to resolve, so confirm they've been resolved before
118118
// proceeding with next steps.
119+
cli.separator();
120+
cli.info(`After cherry-picking:
121+
* The version macros in src/node_version.h should contain whatever values
122+
were previously on master.
123+
* NODE_VERSION_IS_RELEASE should be 0.
124+
`);
125+
cli.separator();
119126
const didResolveConflicts = await cli.prompt(
120127
'Finished resolving cherry-pick conflicts?', { defaultAnswer: true });
121128
if (!didResolveConflicts) {
@@ -186,11 +193,12 @@ class ReleasePromotion {
186193
const components = releaseCommitMessage.split(' ');
187194

188195
// Parse out release date.
189-
if (!components[0].match(/\d{4}-\d{2}-\d{2}/)) {
196+
const match = components[0].match(/\d{4}-\d{2}-\d{2}/);
197+
if (!match) {
190198
cli.error(`Release commit contains invalid date: ${components[0]}`);
191199
return;
192200
}
193-
this.date = components[0];
201+
this.date = match[0];
194202

195203
// Parse out release version.
196204
const version = semver.clean(components[2]);
@@ -243,7 +251,7 @@ class ReleasePromotion {
243251
`v${version}`,
244252
this.getCommitSha(),
245253
'-sm',
246-
`"${this.date} Node.js v${version} ${releaseInfo} Release"`
254+
`${this.date} Node.js v${version} ${releaseInfo} Release`
247255
];
248256

249257
return runSync(secureTag, secureTagOptions);
@@ -271,7 +279,7 @@ class ReleasePromotion {
271279
await fs.writeFile(filePath, arr.join('\n'));
272280

273281
const workingOnVersion =
274-
`${versionComponents.major}.${versionComponents.minor}.${patchVersion}`;
282+
`v${versionComponents.major}.${versionComponents.minor}.${patchVersion}`;
275283

276284
// Create 'Working On' commit.
277285
runSync('git', ['add', filePath]);

0 commit comments

Comments
 (0)