Repository navigation
1.9.79: changelogs.json is JSON again (conflict markers from #327's merge), and no tracked file may hold one - #332
Conversation
… conflict marker 81c601f (#327's squash) took a merge an agent left unresolved: 202-config/changelogs.json held <<<<<<<, ======= and >>>>>>> around two 1.9.79 entries, so the file the in-app release notes read stopped being JSON. Both entries are kept, 1.9.79's first, as each side wrote it. Nothing CI runs would have refused it: PHP lint reads PHP, and no test decoded the file. NoMergeConflictMarkersTest holds every tracked text file to having no conflict-marker line, and every tracked JSON file to parsing. With the marked file put back, both tests fail on it; the tree is otherwise clean. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01VRoS2SViuxaucFaKWsFnLr
Codex Review SummaryThis 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. |
|
claude-review and adversarial-review did not run here, and this PR cannot fix that. The Claude app runs a review only when its workflow file matches master's copy. 6834377 (#275) changed both review workflows on 1.9.79, so neither runs on any PR into 1.9.79 until master carries those files. Re-running gives the same refusal. One related result: on #330's previous head, GitHub's merge with today's 1.9.79 already failed Generated by Claude Code |
…are reviewed again (#341) Claude's GitHub app runs a review only when the workflow file the PR runs is identical to the one on the default branch. 1.9.79 changed adversarial-review.yml (0befdee, 6834377) and claude-code-review.yml (80f983c, 6834377), so every PR against 1.9.79 since then was skipped: 'Workflow validation failed. The workflow file must exist and have identical content to the version on the repository's default branch', then 'the adversarial review did not run' (#331, #332, #334, #335, #336). This takes both files from 1.9.79 unchanged. They read nothing master lacks: .github/review-findings-key.asc is the same file on both, and the review reads CLAUDE.md from the PR's own branch.
1.9.79 is broken at its tip (81c601f).
202-config/changelogs.jsonholds committed conflict markers:They came from the Copilot merge of 1.9.79 into #327 (507dc9e, "Apply remaining changes"), which #327's squash took into 1.9.79. The file is no longer JSON, and it is the one the in-app release notes read (
functions-tracking202.php, around line 1221).The fix: both entries are kept, as each side wrote it, with #321's first, since 1.9.79 had it before #327. The file parses again: 76 entries under 1.9.79, none repeated.
Why nothing caught it: PHP lint reads only PHP, and no test decoded this file. The new
tests/Release/NoMergeConflictMarkersTestchecks two things:<<<<<<<,>>>>>>>,|||||||, or=======alone on a line);With the broken file put back, both tests fail and name it. Restored (
cmp-checked), they pass. The rest of the tree has no such line.Merge this before #330 and #331. Both will take it in their next update from 1.9.79.
No backlog item: found when merging 1.9.79 into #330 at 02:35Z.
Verification
Run in a worktree at 9a2553f (origin/1.9.79 81c601f plus this commit), PHP 8.3:
NoMergeConflictMarkersTest: OK, 2 tests (2,982 assertions). The plant above failed both.phpcs --standard=PSR12andphpstanon the new test: clean.json_decodeof every tracked.json: all parse.The full
verify.shladder was not run, because the change is one JSON hunk and one new test. No live or agent path is touched.Generated by Claude Code