Skip to content

Cascade merge: 4.x into master - #257

Merged
lisachenko merged 4 commits into
masterfrom
4.x
Nov 3, 2026
Merged

lisachenko merged 4 commits into
masterfrom
4.x

Conversation

@github-actions

@github-actions github-actions Bot commented Nov 3, 2026

Copy link
Copy Markdown
Contributor

Automated cascade merge that keeps master in sync with the 4.x maintenance branch.

This PR tracks 4.x and merges automatically once required checks pass. A new one is opened after each merge, so every future push to 4.x keeps flowing forward into master.

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.

claude and others added 3 commits November 3, 2026 17:20
The cascade merge of 4.x into master is pushed with the workflow token, and
such a push triggers no workflow: master has had no build since
2026-10-06 although several merges landed. With workflow_dispatch the full
build can be started on master (or any branch) from the Actions tab or the
API.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01FxhC1CBg4rnTu9UjAMcCpL
ci: allow running the PHPUnit and PHPStan workflows manually
With "Allow auto-merge" off in the repository settings, enabling auto-merge
on the cascade PR fails with "Auto merge is not allowed for this
repository", which failed the whole job although the PR was opened (#257).
The job now reports a notice and leaves the PR open for a manual merge;
any other failure of `gh pr merge` still fails it.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01FxhC1CBg4rnTu9UjAMcCpL
ci: leave the cascade PR open when auto-merge is not allowed
@lisachenko
lisachenko merged commit 795105c into master Nov 3, 2026
8 checks passed
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