Skip to content

fix(ci): validate backports with mergedAt - #17006

Closed
christian-byrne wants to merge 1 commit into
mainfrom
christian-byrne/cifix-16924
Closed

christian-byrne wants to merge 1 commit into
mainfrom
christian-byrne/cifix-16924

Conversation

@christian-byrne

Copy link
Copy Markdown
Contributor

Summary

Restores manual PR backport dispatches by querying the supported mergedAt field instead of the unsupported merged field.

Changes

  • What: Validate merged PRs from a non-null mergedAt; add a workflow regression test that rejects --json merged.

Review Focus

Confirm manual dispatch reports inaccessible, unmerged, and merged PRs distinctly.

Red-main evidence: https://github.com/Comfy-Org/ComfyUI_frontend/actions/runs/33892240975/job/101086446967

@christian-byrne
christian-byrne requested a review from a team September 4, 2026 16:33
@christian-byrne christian-byrne self-assigned this Sep 4, 2026
@coderabbitai

coderabbitai Bot commented Sep 4, 2026

Copy link
Copy Markdown
Contributor

Warning

Review limit reached

Next included review available in 9 minutes.

Check out review usage here.

View limit details

Limit details: You’ve used all 4 included reviews currently available.

Enable usage-based reviews in Billing to review now. Otherwise, wait until the next included review is available.
You're only billed for reviews past your plan's rate limits ($0.25/file).

Learn how review limits work.

Review configuration:

⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: ASSERTIVE

Plan: Team

Run ID: ea215d3f-31ed-476b-9208-e79615cb2da3

📥 Commits

Reviewing files that changed from the base of the PR and between e6be49f and f0c7699.

📒 Files selected for processing (2)
  • .github/workflows/pr-backport.yaml
  • scripts/cicd/pr-backport-workflow.test.ts

Comment @coderabbitai help to get the list of available commands.

@github-actions

github-actions Bot commented Sep 4, 2026 •

Copy link
Copy Markdown
Contributor

🎭 Playwright: ✅ 1908 passed, 0 failed

📊 Browser Reports
  • chromium: View Report (✅ 1887 / ❌ 0 / ⚠️ 0 / ⏭️ 13)
  • chromium-2x: View Report (✅ 2 / ❌ 0 / ⚠️ 0 / ⏭️ 0)
  • chromium-0.5x: View Report (✅ 1 / ❌ 0 / ⚠️ 0 / ⏭️ 0)
  • mobile-chrome: View Report (✅ 18 / ❌ 0 / ⚠️ 0 / ⏭️ 0)

@christian-byrne

Copy link
Copy Markdown
Contributor Author

Duplicate of #16992; closing without merge.

Full context for agent readers

Created during overlapping red-main response before the existing carrier was visible. #16992 carries the same workflow fix plus a repo-wide regression guard, and is already tracked for approval.

@christian-byrne

Copy link
Copy Markdown
Contributor Author

this collides with #16992, which fixes the same gh pr view --json merged breakage on the same two lines of .github/workflows/pr-backport.yaml but uses --json state with .state == "MERGED" instead of mergedAt. both read MERGEABLE right now only because they conflict with each other rather than with main.

the test here makes it order-sensitive rather than a plain conflict: pr-backport-workflow.test.ts asserts toContain('--json mergedAt'), which #16992 fails, so whichever of the two lands second is red on the other's test as well as needing a manual resolve.

#16992 also covers the second call site in backport-auto-merge.yaml (where the error is swallowed by 2>/dev/null || echo false, so the merge-race check silently answers "not merged" for every PR) and adds a repo-wide scan for removed gh pr view --json fields, so it may be the better base to consolidate on. would it be reasonable to close this in favour of #16992 and move the mergedAt assertion over as an added case there? tracked as prhyg-83 (pr-hygiene sweep 2026-09-04T16:33Z).

@github-actions github-actions Bot added the risk:xhigh PR risk grade (advisory shadow check; grader-owned) label Sep 4, 2026
@codecov

codecov Bot commented Sep 4, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.

@@            Coverage Diff             @@
##             main   #17006      +/-   ##
==========================================
+ Coverage   81.24%   82.81%   +1.56%     
==========================================
  Files        2464     2046     -418     
  Lines      126963   119485    -7478     
  Branches    33863    30204    -3659     
==========================================
- Hits       103148    98947    -4201     
+ Misses      23300    20358    -2942     
+ Partials      515      180     -335     
Flag Coverage Δ
unit 77.29% <ø> (ø)
website-unit ?

Flags with carried forward coverage won't be shown. Click here to find out more.
see 418 files with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

risk:xhigh PR risk grade (advisory shadow check; grader-owned)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant