Add automerge workflow#202
Merged
Merged
Conversation
lumachad
force-pushed
the
users/github/automerge
branch
10 times, most recently
from
76113e7 to
79f487d
Compare
lumachad
force-pushed
the
users/github/automerge
branch
from
79f487d to
e76c576
Compare
spatrang
reviewed
Jul 14, 2026
lumachad
force-pushed
the
users/github/automerge
branch
from
e76c576 to
c56e8d8
Compare
Adds a GitHub Actions workflow that hourly syncs sourceware/master into origin/amd-staging. The workflow also triggers on closure of fast-forward or conflict PRs to immediately start the next sync. On a clean merge, a fast-forward PR is opened against amd-staging for CI validation. On a conflict, a conflict PR is opened for manual resolution. Only one PR of either type is allowed open at a time and further syncs are postponed until it is resolved. The fast-forward PR range is expressed as merge-base..last-clean-commit so the title and compare URL are always meaningful even when only one commit is being merged. The script lives in .github/scripts/automerge.py and is documented in .github/scripts/automerge.md.
lumachad
force-pushed
the
users/github/automerge
branch
from
c56e8d8 to
6ef8ca9
Compare
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
3 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.
Adds a GitHub Actions workflow that every 6 hours syncs sourceware/master into
origin/amd-staging. The workflow also triggers on closure of fast-forward
or conflict PRs to immediately start the next sync.
On a clean merge, a fast-forward PR is opened against amd-staging for CI
validation. On a conflict, a conflict PR is opened for manual resolution.
Only one PR of either type is allowed open at a time and further syncs are
postponed until it is resolved.
The fast-forward PR range is expressed as merge-base..last-clean-commit
so the title and compare URL are always meaningful even when only one
commit is being merged.
The script lives in .github/scripts/automerge.py and is documented in
.github/scripts/automerge.md.