Skip to content

fix: release script squash-merge compat and backmerge automation #12162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
0xApotheosis merged 10 commits into from
Mar 17, 2026
+113 −32
Merged

fix: release script squash-merge compat and backmerge automation #12162

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
36861b4
fix: prevent duplicate private sync pr in release script
gomesalexandre Mar 13, 2026
9b15248
fix: prevent duplicate private sync pr in release script
gomesalexandre Mar 13, 2026
07ef2a2
Merge remote-tracking branch 'origin/develop' into fix_release_duplic…
gomesalexandre Mar 13, 2026
33f7c0c
fix: idle prereleaseMerged content diff + tagged_private_stale backme…
gomesalexandre Mar 13, 2026
66bb840
fix: coderabbitai review - prereleaseMerged ahead-check + no early br…
gomesalexandre Mar 13, 2026
c0f8456
fix: prettier formatting in release script
gomes-bot Mar 13, 2026
1ac101d
Merge remote-tracking branch 'origin/develop' into fix_release_duplic…
gomes-bot Mar 16, 2026
7f25225
fix: enable auto-merge on existing backmerge PRs during reruns
gomes-bot Mar 16, 2026
d902c7c
Merge branch 'develop' into fix_release_duplicate_private_sync_pr_v2
gomesalexandre Mar 17, 2026
84775fb
fix: lint
gomesalexandre Mar 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
145 changes: 113 additions & 32 deletions scripts/release.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,12 @@ const doRegularRelease = async () => {
// Two sub-states within idle:
// 1. Release branch ahead of main (prerelease merged) -> create release -> main PR
// 2. Release branch matches main (fresh start) -> create develop -> release PR
const prereleaseMerged = releaseSha !== mainSha
// Use commit-ahead check (not SHA) to correctly detect if release is ahead of main.
// SHA equality breaks with squash merges; content diff alone breaks when release is *behind* main.
const releaseMatchesMain = !(await git().diff(['origin/main', 'origin/release']))
const releaseHasCommitsNotInMain =
(await getCommitMessages('origin/main..origin/release')).length > 0
const prereleaseMerged = releaseHasCommitsNotInMain && !releaseMatchesMain

if (prereleaseMerged) {
const messages = await getCommitMessages(`${latestTag}..origin/release`)
Expand Down Expand Up @@ -610,26 +615,11 @@ const doRegularRelease = async () => {
await git().push(['origin', '--tags'])
console.log(chalk.green(`Tagged ${nextVersion}.`))

console.log(chalk.green('Creating PR to sync private to main...'))
const privatePrUrl = await createPr({
base: 'private',
head: 'main',
title: `chore: sync private to ${nextVersion}`,
body: `Sync private branch to main after release ${nextVersion}.`,
})
console.log(chalk.green(`Private sync PR created: ${privatePrUrl}`))
console.log(chalk.green('Merge it on GitHub to complete the release.'))
break
}

case 'tagged_private_stale': {
console.log(chalk.yellow(`${nextVersion} is tagged but private is behind main.`))

const existingPrivatePr = await findOpenPr('main', 'private')
if (existingPrivatePr) {
const existingPrivatePrAfterTag = await findOpenPr('main', 'private')
if (existingPrivatePrAfterTag) {
console.log(
chalk.yellow(
`Private sync PR already open: #${existingPrivatePr.number}. Merge it on GitHub.`,
`Private sync PR already open: #${existingPrivatePrAfterTag.number}. Merge it on GitHub.`,
),
)
} else {
Expand All @@ -641,6 +631,71 @@ const doRegularRelease = async () => {
body: `Sync private branch to main after release ${nextVersion}.`,
})
console.log(chalk.green(`Private sync PR created: ${privatePrUrl}`))
console.log(chalk.green('Merge it on GitHub to complete the release.'))
}
break
}

case 'tagged_private_stale': {
console.log(chalk.yellow(`${nextVersion} is tagged but private is behind main.`))

const privateDiff = await git().diff(['origin/main', 'origin/private'])
const shouldSyncPrivate = Boolean(privateDiff)

if (!shouldSyncPrivate) {
console.log(
chalk.green(
'Private is already in sync with main content-wise. Skipping private sync PR.',
),
)
} else {
const existingPrivatePr = await findOpenPr('main', 'private')
if (existingPrivatePr) {
console.log(
chalk.yellow(
`Private sync PR already open: #${existingPrivatePr.number}. Merge it on GitHub.`,
),
)
} else {
console.log(chalk.green('Creating PR to sync private to main...'))
const privatePrUrl = await createPr({
base: 'private',
head: 'main',
title: `chore: sync private to ${nextVersion}`,
body: `Sync private branch to main after release ${nextVersion}.`,
})
console.log(chalk.green(`Private sync PR created: ${privatePrUrl}`))
}
}

const existingBackmerge = await findOpenPr('main', 'develop')
if (existingBackmerge) {
console.log(
chalk.yellow(
`Backmerge PR already open: #${existingBackmerge.number}. Enabling auto-merge...`,
),
)
await pify(exec)(`gh pr merge --auto --merge ${existingBackmerge.number}`)
console.log(
chalk.green('Auto-merge set. Backmerge will merge automatically when CI passes.'),
)
} else {
const mainDevelopCommits = await getCommitMessages('origin/develop..origin/main')
if (mainDevelopCommits.length > 0) {
console.log(chalk.green('Creating backmerge PR (main -> develop)...'))
const backmergeUrl = await createPr({
base: 'develop',
head: 'main',
title: `chore: backmerge ${nextVersion} into develop`,
body: `Backmerge main into develop after release ${nextVersion}.`,
})
console.log(chalk.green(`Backmerge PR created: ${backmergeUrl}`))
console.log(chalk.green('Setting auto-merge with merge commit strategy...'))
await pify(exec)(`gh pr merge --auto --merge ${backmergeUrl}`)
console.log(
chalk.green('Auto-merge set. Backmerge will merge automatically when CI passes.'),
)
}
}
break
}
Expand Down Expand Up @@ -787,26 +842,47 @@ const doHotfixRelease = async () => {
case 'tagged_private_stale': {
console.log(chalk.yellow(`${nextVersion} is tagged but private is behind main.`))

const existingPrivatePr = await findOpenPr('main', 'private')
if (existingPrivatePr) {
const privateDiffHotfix = await git().diff(['origin/main', 'origin/private'])
const shouldSyncPrivateHotfix = Boolean(privateDiffHotfix)

if (!shouldSyncPrivateHotfix) {
console.log(
chalk.yellow(
`Private sync PR already open: #${existingPrivatePr.number}. Merge it on GitHub.`,
chalk.green(
'Private is already in sync with main content-wise. Skipping private sync PR.',
),
)
} else {
console.log(chalk.green('Creating PR to sync private to main...'))
const privatePrUrl = await createPr({
base: 'private',
head: 'main',
title: `chore: sync private to ${nextVersion}`,
body: `Sync private branch to main after hotfix ${nextVersion}.`,
})
console.log(chalk.green(`Private sync PR created: ${privatePrUrl}`))
const existingPrivatePr = await findOpenPr('main', 'private')
if (existingPrivatePr) {
console.log(
chalk.yellow(
`Private sync PR already open: #${existingPrivatePr.number}. Merge it on GitHub.`,
),
)
} else {
console.log(chalk.green('Creating PR to sync private to main...'))
const privatePrUrl = await createPr({
base: 'private',
head: 'main',
title: `chore: sync private to ${nextVersion}`,
body: `Sync private branch to main after hotfix ${nextVersion}.`,
})
console.log(chalk.green(`Private sync PR created: ${privatePrUrl}`))
}
}

const existingBackmerge = await findOpenPr('main', 'develop')
if (!existingBackmerge) {
if (existingBackmerge) {
console.log(
chalk.yellow(
`Backmerge PR already open: #${existingBackmerge.number}. Enabling auto-merge...`,
),
)
await pify(exec)(`gh pr merge --auto --merge ${existingBackmerge.number}`)
console.log(
chalk.green('Auto-merge set. Backmerge will merge automatically when CI passes.'),
)
} else {
const mainDevelopDiff = await getCommitMessages('origin/develop..origin/main')
if (mainDevelopDiff.length > 0) {
console.log(chalk.green('Creating backmerge PR (main -> develop)...'))
Expand All @@ -817,6 +893,11 @@ const doHotfixRelease = async () => {
body: `Backmerge main into develop after hotfix ${nextVersion}.`,
})
console.log(chalk.green(`Backmerge PR created: ${backmergeUrl}`))
console.log(chalk.green('Setting auto-merge with merge commit strategy...'))
await pify(exec)(`gh pr merge --auto --merge ${backmergeUrl}`)
console.log(
chalk.green('Auto-merge set. Backmerge will merge automatically when CI passes.'),
)
}
}
break
Expand Down
Loading