Repository navigation
Conversation
… was merged with The Changelog entry job compared the checked-out merge commit with the base commit recorded in the event payload. That commit stays where the pull request opened, so after another pull request merged, its fragment was counted against every open pull request, and a change to a fragment that reached the base branch later could go unseen. The script now takes the base from the first parent of the merge commit, after confirming the second parent is the pull request head, and refuses any other commit. The workflow passes the head commit instead of the recorded base. Refs #1339
Codex Review Summary: ✅ CompletedThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
|
@codex review |
|
Codex Review: Didn't find any major issues. Bravo. Reviewed commit: ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
If Codex has suggestions, it will comment; otherwise it will react with 👍. Codex can also answer questions or update the PR. Try commenting "@codex address that feedback". |
🛡️ Codex Security Review · Automatically triggeredSecurity review completed. No security issues were found in this pull request. Reviewed commit: Only the user who started this review can view the report in Codex. ℹ️ About Codex security reviews in GitHubThis is an experimental Codex feature. Security reviews are triggered when:
Once complete, Codex will leave suggestions, or a comment if no findings are found. |
Refs #1339
What
The
Changelog entryjob now compares the pull request against the base it was actually merged with.scripts/check_changelog_entry.pygains--merged-head <commit>. With it,--headmust be the merge commit of that head into the base branch: exactly two parents, the pull request head second. The first parent is used as the base. Any other commit is refused with exit code 2, so the job never guesses a base.--basestill works for local use; exactly one of the two is required.CONTRIBUTING.mdsays what "the base" means in CI.Why
The recorded base commit stays where the pull request opened. After another pull request merged a fragment, the job counted that fragment against every open pull request and failed them. It could also miss a change to a fragment that reached the base branch after the pull request opened.
Tests
Four new tests build a small repository with the same shape (another pull request merges first, then the merge commit of this one):
One existing workflow contract test pinned the old input; its assertion on that input is replaced by assertions on the new one. No test was removed.
Checked against real merge commits of open pull requests: the one that fails today passes with the new input and still fails with the old one; two that pass today pass with both.
Not changed
The checks themselves, labels, advisory mode, release-cut handling and the release coverage script are untouched. Two other steps read the same recorded base commit; they are named in the issue and left alone here.