Skip to content

ci: cascade-merge 4.x into master - #843

Merged
lisachenko merged 1 commit into
4.xfrom
ci/merge-up-4.x
Nov 8, 2026
Merged

lisachenko merged 1 commit into
4.xfrom
ci/merge-up-4.x

Conversation

@lisachenko

Copy link
Copy Markdown
Member

What and why

Brings the merge-up workflow from #841 to 4.x. A workflow triggered by a push runs from the branch that was pushed, so .github/workflows/merge-up.yml has to be on 4.x before the cascade can start. After this, every push to 4.x opens or updates a chore: merge 4.x into master PR. CS, PHPStan and PHPUnit also run on pushes to 4.x.

The head is commit 3ff646c itself: the same commit master already contains through #841, and its parent is the current tip of 4.x. The commit is not duplicated.

Merge with "Create a merge commit". Squash or rebase would create a new commit, which the next merge-up PR would then bring into master as a duplicate.

Checklist


Generated by Claude Code

A push to the 4.x maintenance branch opens (or updates) a "merge 4.x into
master" pull request, so fixes made on 4.x are carried forward. CI also runs
on pushes to 4.x.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01FxhC1GE15owYbSGjsHAjCr
@lisachenko
lisachenko marked this pull request as ready for review November 8, 2026 12:32
@codecov

codecov Bot commented Nov 8, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 98.60%. Comparing base (5d52481) to head (3ff646c).
✅ All tests successful. No failed tests found.

Additional details and impacted files
@@            Coverage Diff            @@
##                4.x     #843   +/-   ##
=========================================
  Coverage     98.60%   98.60%           
  Complexity     2291     2291           
=========================================
  Files           131      131           
  Lines          5947     5947           
=========================================
  Hits           5864     5864           
  Misses           83       83           

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

@lisachenko
lisachenko merged commit 49a2a78 into 4.x Nov 8, 2026
14 checks passed
@lisachenko
lisachenko deleted the ci/merge-up-4.x branch November 8, 2026 12:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

2 participants