Cascade merge: 4.x into master - #216
Merged
Merged
Conversation
Adds a workflow that keeps master in sync with the 4.x maintenance branch: on every push to 4.x it opens (or reuses) a PR from 4.x into master and enables auto-merge, so fixes landed on 4.x flow forward automatically once required checks pass. Requires the repo settings "Allow auto-merge" and "Allow GitHub Actions to create and approve pull requests" to be enabled. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_013xfs2FHTpipY3LRBtC5vLK
The default GITHUB_TOKEN can open/merge PRs, but pull_request-triggered checks (PHPUnit, PHPStan) on a PR it opens are held for manual approval by GitHub's anti-recursion safeguard, so the first cascade PR (#216) never got its required checks to run automatically. Prefer an optional CASCADE_TOKEN repo secret (a PAT with Contents: write, Pull requests: write) when set, falling back to GITHUB_TOKEN otherwise. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_013xfs2FHTpipY3LRBtC5vLK
2 tasks
ci: allow a PAT to drive the cascade PR
3 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Automated cascade merge that keeps
masterin sync with the4.xmaintenance branch.This PR tracks
4.xand merges automatically once required checks pass. A new one is opened after each merge, so every future push to4.xkeeps flowing forward intomaster.If this PR shows a conflict, resolve it manually on
4.x(or directly on this PR's branch) — auto-merge will pick it up once it's clean again.