[ci] Auto-resolve predictable PR conflicts#237
Merged
Conversation
Contributor
|
🚀 Preview is available for this pull request. |
7 tasks
10 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
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.
Related Issue
Closes #192
Motivation / Context
mainmoved a workflow-managed.github/wikipointer or becauseCHANGELOG.mdgained adjacentUnreleasedentries.Unreleasedentries into the activeUnreleasedsection, so release promotion onmaindoes not cause new branch notes to land under the wrong published version.Changes
auto-resolve-conflicts.ymlworkflow plus packaged consumer wrapper.github/resolve-predictable-conflictsaction that scans same-repository PRs, attempts a local merge, and only pushes a resolution when conflicts are limited to.github/wikiand/orCHANGELOG.md.UnreleasedChangelogConflictResolverwith tests covering normal drift, release-moved base state, and deduplication.Verification
composer dev-tools(timed out after 300s during metrics; before timeout it reported full PHPUnit success: 519 tests, 1600 assertions, and only the Rector findings that are now fixed)composer dev-tools refactor -- --jsoncomposer dev-tools code-style -- --jsoncomposer dev-tools phpdoc -- --jsoncomposer dev-tools docs -- --jsoncomposer dev-tools changelog:checkcomposer dev-tools tests -- --filter=Changelogcomposer dev-tools tests -- --filter='Changelog|ComposerDependencyAnalyserConfigTest|ECSConfigTest'php -l .github/actions/github/resolve-predictable-conflicts/resolve-changelog.php && bash -n .github/actions/github/resolve-predictable-conflicts/run.shYAML.load_filefor the new workflow/action filesUnreleasedafter base release promotionDocumentation / Generated Output
docs/updatedChangelog
CHANGELOG.mdentryReviewer Notes
.github/wiki/CHANGELOG.mdaborts back to manual resolution..github/wikikeeps the PR side because it represents the preview branch pointer for that PR.Additional Review Validation
.github/actions/github/resolve-predictable-conflicts/run.shend to end by:CHANGELOG.mdmerge conflict;gh pr view,gh workflow view, andgh workflow run;Unreleasedand kept the base release entry under1.2.0;tests.ymldispatch was requested withpublish-required-statuses=true.