Skip to content

fix: use content diff for private sync state detection in release script #12181

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
gomesalexandre merged 8 commits into from
Mar 17, 2026
+95 −78
Merged

fix: use content diff for private sync state detection in release script #12181

Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7d598bb
fix: bump NativeQrScanner minimum version to 3.7.2 (#12173)
0xApotheosis Mar 16, 2026
fc5f63a
chore: release v1.1017.0 (#12167)
gomesalexandre Mar 17, 2026
acb8d81
fix: use content diff for private sync state detection in release script
gomesalexandre Mar 17, 2026
ada2f02
chore: merge origin/develop into fix/release-script-no-commits-crash
gomesalexandre Mar 17, 2026
8d621bb
fix: lint
gomesalexandre Mar 17, 2026
ef3bb14
fix: null guards and remove redundant diff in hotfix tagged_private_s…
gomesalexandre Mar 17, 2026
5e8517a
Merge branch 'develop' into fix/release-script-no-commits-crash
gomesalexandre Mar 17, 2026
892e055
fix: use latestTag in tagged_private_stale private sync PR title/body
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
173 changes: 95 additions & 78 deletions scripts/release.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,15 @@ export const deriveReleaseState = ({
releaseSha,
mainSha,
developSha,
privateSha,
privateContentMatchesMain,
latestTagSha,
openPrereleasePr,
openReleasePr,
}: {
releaseSha: string
mainSha: string
developSha: string
privateSha: string
privateContentMatchesMain: boolean
latestTagSha: string
openPrereleasePr: GitHubPr | undefined
openReleasePr: GitHubPr | undefined
Expand All @@ -88,7 +88,7 @@ export const deriveReleaseState = ({

if (mainSha !== latestTagSha) return 'merged_untagged'

if (privateSha !== mainSha) return 'tagged_private_stale'
if (!privateContentMatchesMain) return 'tagged_private_stale'

if (releaseSha === mainSha && developSha === mainSha) return 'done'

Expand All @@ -97,18 +97,18 @@ export const deriveReleaseState = ({

export const deriveHotfixState = ({
mainSha,
privateSha,
privateContentMatchesMain,
latestTagSha,
openHotfixPr,
}: {
mainSha: string
privateSha: string
privateContentMatchesMain: boolean
latestTagSha: string
openHotfixPr: GitHubPr | undefined
}): HotfixState => {
if (openHotfixPr) return 'hotfix_pr_open'
if (mainSha !== latestTagSha) return 'merged_untagged'
if (privateSha !== mainSha) return 'tagged_private_stale'
if (!privateContentMatchesMain) return 'tagged_private_stale'
return 'idle'
}

Expand Down Expand Up @@ -402,7 +402,7 @@ const createPr = async ({
head: string
title: string
body: string
}): Promise<string> => {
}): Promise<string | null> => {
const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'shapeshift-release-body-'))
const bodyPath = path.join(tmpDir, 'body.md')

Expand All @@ -424,6 +424,9 @@ const createPr = async ({
])
const stdout = typeof result === 'string' ? result : (result as { stdout: string }).stdout
return stdout.trim()
} catch (err) {
if (String(err).includes('No commits between')) return null
throw err
} finally {
try {
fs.rmSync(tmpDir, { recursive: true, force: true })
Expand Down Expand Up @@ -484,24 +487,26 @@ const doRegularRelease = async () => {
const nextVersion = await getNextVersion('minor')
const latestTag = await getLatestSemverTag()

const [releaseSha, mainSha, developSha, privateSha, latestTagSha] = await Promise.all([
const [releaseSha, mainSha, developSha, latestTagSha] = await Promise.all([
getSha('origin/release'),
getSha('origin/main'),
getSha('origin/develop'),
getSha('origin/private'),
getTagSha(latestTag),
])

const [openPrereleasePr, openReleasePr] = await Promise.all([
const [openPrereleasePr, openReleasePr, privateContentMatchesMain] = await Promise.all([
findOpenPr('develop', 'release'),
findOpenPr('release', 'main'),
git()
.diff(['origin/main', 'origin/private'])
.then(diff => !diff),
])

const state = deriveReleaseState({
releaseSha,
mainSha,
developSha,
privateSha,
privateContentMatchesMain,
latestTagSha,
openPrereleasePr,
openReleasePr,
Expand Down Expand Up @@ -551,6 +556,8 @@ const doRegularRelease = async () => {
title: `chore: release ${nextVersion}`,
body: releaseBody,
})
if (!releasePrUrl)
exit(chalk.red('Failed to create release PR - no commits between branches.'))
console.log(chalk.green(`Release PR created: ${releasePrUrl}`))
console.log(
chalk.green(
Expand All @@ -574,6 +581,8 @@ const doRegularRelease = async () => {
title: `chore: prerelease ${nextVersion}`,
body: `## Prerelease ${nextVersion}\n\n${commitList}`,
})
if (!prereleasePrUrl)
exit(chalk.red('Failed to create prerelease PR - no commits between branches.'))
console.log(chalk.green(`Prerelease PR created: ${prereleasePrUrl}`))
console.log(
chalk.green(
Expand Down Expand Up @@ -630,41 +639,38 @@ const doRegularRelease = async () => {
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.'))
if (privatePrUrl) {
console.log(chalk.green(`Private sync PR created: ${privatePrUrl}`))
console.log(chalk.green('Merge it on GitHub to complete the release.'))
} else {
console.log(chalk.green('private already in sync with main - nothing to do.'))
}
}
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)
console.log(chalk.yellow(`${latestTag} is tagged but private is behind main.`))

if (!shouldSyncPrivate) {
const existingPrivatePr = await findOpenPr('main', 'private')
if (existingPrivatePr) {
console.log(
chalk.green(
'Private is already in sync with main content-wise. Skipping private sync PR.',
chalk.yellow(
`Private sync PR already open: #${existingPrivatePr.number}. Merge it on GitHub.`,
),
)
} 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('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}.`,
})
if (privatePrUrl) {
console.log(chalk.green(`Private sync PR created: ${privatePrUrl}`))
} else {
console.log(chalk.green('private already in sync with main - nothing to do.'))
}
}

Expand All @@ -689,12 +695,16 @@ const doRegularRelease = async () => {
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.'),
)
if (backmergeUrl) {
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.'),
)
} else {
console.log(chalk.green('develop already in sync with main - nothing to do.'))
}
}
}
break
Expand All @@ -718,18 +728,19 @@ const doHotfixRelease = async () => {
const nextVersion = await getNextVersion('patch')
const latestTag = await getLatestSemverTag()

const [mainSha, privateSha, latestTagSha] = await Promise.all([
getSha('origin/main'),
getSha('origin/private'),
getTagSha(latestTag),
])
const [mainSha, latestTagSha] = await Promise.all([getSha('origin/main'), getTagSha(latestTag)])

const hotfixBranch = `hotfix/${nextVersion}`
const openHotfixPr = await findOpenPr(hotfixBranch, 'main')
const [openHotfixPr, privateContentMatchesMain] = await Promise.all([
findOpenPr(hotfixBranch, 'main'),
git()
.diff(['origin/main', 'origin/private'])
.then(diff => !diff),
])

const state = deriveHotfixState({
mainSha,
privateSha,
privateContentMatchesMain,
latestTagSha,
openHotfixPr,
})
Expand Down Expand Up @@ -795,6 +806,7 @@ const doHotfixRelease = async () => {
body: `## Hotfix ${nextVersion}\n\n${commitList}`,
})

if (!prUrl) exit(chalk.red('Failed to create hotfix PR - no commits between branches.'))
console.log(chalk.green(`Hotfix PR created: ${prUrl}`))
console.log(chalk.green('Merge it on GitHub, then run this script again to finalize.'))
break
Expand Down Expand Up @@ -825,7 +837,11 @@ const doHotfixRelease = async () => {
title: `chore: sync private to ${nextVersion}`,
body: `Sync private branch to main after hotfix ${nextVersion}.`,
})
console.log(chalk.green(`Private sync PR created: ${privatePrUrl}`))
if (privatePrUrl) {
console.log(chalk.green(`Private sync PR created: ${privatePrUrl}`))
} else {
console.log(chalk.green('private already in sync with main - nothing to do.'))
}

console.log(chalk.green('Creating backmerge PR (main -> develop)...'))
const backmergeUrl = await createPr({
Expand All @@ -834,40 +850,37 @@ const doHotfixRelease = async () => {
title: `chore: backmerge ${nextVersion} into develop`,
body: `Backmerge main into develop after hotfix ${nextVersion} to sync cherry-picked commits.`,
})
console.log(chalk.green(`Backmerge PR created: ${backmergeUrl}`))
if (backmergeUrl) {
console.log(chalk.green(`Backmerge PR created: ${backmergeUrl}`))
} else {
console.log(chalk.green('develop already in sync with main - nothing to do.'))
}
console.log(chalk.green('Merge both PRs on GitHub to complete the hotfix.'))
break
}

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

const privateDiffHotfix = await git().diff(['origin/main', 'origin/private'])
const shouldSyncPrivateHotfix = Boolean(privateDiffHotfix)
console.log(chalk.yellow(`${latestTag} is tagged but private is behind main.`))

if (!shouldSyncPrivateHotfix) {
const existingPrivatePr = await findOpenPr('main', 'private')
if (existingPrivatePr) {
console.log(
chalk.green(
'Private is already in sync with main content-wise. Skipping private sync PR.',
chalk.yellow(
`Private sync PR already open: #${existingPrivatePr.number}. Merge it on GitHub.`,
),
)
} 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 hotfix ${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 hotfix ${nextVersion}.`,
})
if (privatePrUrl) {
console.log(chalk.green(`Private sync PR created: ${privatePrUrl}`))
} else {
console.log(chalk.green('private already in sync with main - nothing to do.'))
}
}

Expand All @@ -892,12 +905,16 @@ const doHotfixRelease = async () => {
title: `chore: backmerge ${nextVersion} into develop`,
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.'),
)
if (backmergeUrl) {
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.'),
)
} else {
console.log(chalk.green('develop already in sync with main - nothing to do.'))
}
}
}
break
Expand Down
Loading