diff --git a/scripts/release/generate-pr-description.ts b/scripts/release/generate-pr-description.ts index 6c682cb37368..363520474e88 100644 --- a/scripts/release/generate-pr-description.ts +++ b/scripts/release/generate-pr-description.ts @@ -51,6 +51,7 @@ const CHANGE_TITLES_TO_IGNORE = [ /\[skip ci\]/i, /\[ci skip\]/i, /^Update CHANGELOG\.md for.*/i, + /^Release: (Pre)?(Patch|Minor|Major|Release).*\d+$/i, ]; export const mapToChangelist = ({ diff --git a/scripts/release/pick-patches.ts b/scripts/release/pick-patches.ts index 20a3f2d6a870..fa19a1e347f1 100644 --- a/scripts/release/pick-patches.ts +++ b/scripts/release/pick-patches.ts @@ -118,7 +118,7 @@ export const run = async (_: unknown) => { const prSpinner = ora(`Cherry picking #${pr.number}`).start(); try { - await git.raw(['cherry-pick', '-m', '1', '-x', pr.mergeCommit]); + await git.raw(['cherry-pick', '-m', '1', '--keep-redundant-commits', '-x', pr.mergeCommit]); prSpinner.succeed(`Picked: ${formatPR(pr)}`); } catch (pickError) { prSpinner.fail(`Failed to automatically pick: ${formatPR(pr)}`);