@@ -116,6 +116,13 @@ class ReleasePromotion {
116
116
// There will be cherry-pick conflicts the Releaser will
117
117
// need to resolve, so confirm they've been resolved before
118
118
// 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 ( ) ;
119
126
const didResolveConflicts = await cli . prompt (
120
127
'Finished resolving cherry-pick conflicts?' , { defaultAnswer : true } ) ;
121
128
if ( ! didResolveConflicts ) {
@@ -186,11 +193,12 @@ class ReleasePromotion {
186
193
const components = releaseCommitMessage . split ( ' ' ) ;
187
194
188
195
// 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 ) {
190
198
cli . error ( `Release commit contains invalid date: ${ components [ 0 ] } ` ) ;
191
199
return ;
192
200
}
193
- this . date = components [ 0 ] ;
201
+ this . date = match [ 0 ] ;
194
202
195
203
// Parse out release version.
196
204
const version = semver . clean ( components [ 2 ] ) ;
@@ -243,7 +251,7 @@ class ReleasePromotion {
243
251
`v${ version } ` ,
244
252
this . getCommitSha ( ) ,
245
253
'-sm' ,
246
- `" ${ this . date } Node.js v${ version } ${ releaseInfo } Release" `
254
+ `${ this . date } Node.js v${ version } ${ releaseInfo } Release`
247
255
] ;
248
256
249
257
return runSync ( secureTag , secureTagOptions ) ;
@@ -271,7 +279,7 @@ class ReleasePromotion {
271
279
await fs . writeFile ( filePath , arr . join ( '\n' ) ) ;
272
280
273
281
const workingOnVersion =
274
- `${ versionComponents . major } .${ versionComponents . minor } .${ patchVersion } ` ;
282
+ `v ${ versionComponents . major } .${ versionComponents . minor } .${ patchVersion } ` ;
275
283
276
284
// Create 'Working On' commit.
277
285
runSync ( 'git' , [ 'add' , filePath ] ) ;
0 commit comments