Skip to content

Commit 8aa8c08

Browse files
committed
run cherry-pick --continue
1 parent d9d97cb commit 8aa8c08

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

lib/promote_release.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import PRData from './pr_data.js';
99
import PRChecker from './pr_checker.js';
1010
import Request from './request.js';
1111
import Session from './session.js';
12+
import { existsSync } from 'node:fs';
1213

1314
export default class ReleasePromotion extends Session {
1415
constructor(argv, cli, dir) {
@@ -147,6 +148,12 @@ export default class ReleasePromotion extends Session {
147148
throw new Error('Aborted');
148149
}
149150

151+
if (existsSync('.git/CHERRY_PICK_HEAD')) {
152+
cli.info('Cherry-pick is still in progress, attempting to continue it.');
153+
await forceRunAsync('git', ['cherry-pick', ...this.gpgSign, '--continue'],
154+
{ ignoreFailure: false });
155+
}
156+
150157
// Validate release commit on the default branch
151158
const releaseCommitOnDefaultBranch =
152159
await forceRunAsync('git', ['show', 'HEAD', '--name-only', '--pretty=format:%s'],

0 commit comments

Comments
 (0)