auto-backmerge's needs_review safety net parked the PR whenever a code file existed only on main. The version manifests (package.json, package-lock.json, .claude-plugin/plugin.json, gemini-extension.json) diverge every release by design (next runs a -dev version), so the net misfired on every release — and that manual-review park is what let the back-merge sit and go stale (e.g. #1379, which then conflicted with a later #1777 purity-gate edit to fragments it had deleted). Exclude the generated package-lock.json outright (it carries a version per package entry, so a dep bump is indistinguishable from a release stamp; it only mirrors package.json, still checked). For package.json / plugin.json / gemini-extension.json, ignore a drop whose main-vs-base diff touches only the top-level "version" field. A substantive (non-version) straight-to-main change still parks, preserving the safety net's real purpose. Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -103,3 +103,33 @@ describe('Require Issue Link back-merge automation carve-out', () => {
|
||||
assert.match(workflow, /steps\.check\.outputs\.found == 'false'/);
|
||||
});
|
||||
});
|
||||
|
||||
describe('Auto-backmerge needs_review version-manifest carve-out (#1404)', () => {
|
||||
const workflow = readWorkflow('.github/workflows/auto-backmerge.yml');
|
||||
|
||||
test('all four version manifests are filtered via version-only detection', () => {
|
||||
// package.json / package-lock.json / plugin.json / gemini-extension.json
|
||||
// diverge every release; a drop that is ONLY "version" lines must not park
|
||||
// (parking is what lets the back-merge go stale). A substantive change still
|
||||
// parks. (#1404)
|
||||
assert.ok(
|
||||
workflow.includes("VERSION_STAMP_MANIFESTS='package.json package-lock.json .claude-plugin/plugin.json gemini-extension.json'"),
|
||||
'auto-backmerge.yml must version-only-filter all four version manifests'
|
||||
);
|
||||
assert.ok(
|
||||
workflow.includes(`grep -vE '^[+-][[:space:]]*"version":'`),
|
||||
'auto-backmerge.yml must filter version-only diffs via the "version" grep'
|
||||
);
|
||||
});
|
||||
|
||||
test('package-lock.json is NOT blindly excluded (lockfile-only changes still park)', () => {
|
||||
// A lockfile-only substantive change (e.g. npm audit fix) rewrites
|
||||
// resolved/integrity lines, so version-only filtering lets it through to
|
||||
// review rather than dropping it silently. Guard against regression to a
|
||||
// blanket exclude. (#1404)
|
||||
assert.ok(
|
||||
!workflow.includes(":(exclude)package-lock.json"),
|
||||
'package-lock.json must not be globally excluded; rely on version-only filtering'
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user