github_sync: smarter target branch selection #6
Conversation
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
Contributor
Author
|
Depends on #4 |
danielocfb
approved these changes
Jun 16, 2025
danielocfb
left a comment
danielocfb
left a comment
There was a problem hiding this comment.
Looks good to me. Left a few minor comments. Thanks!
theihor
force-pushed
the
sticky-target
branch
2 times, most recently
from
a20ad99 to
6532274
Compare
Implement "sticky" target branch: if a series has an associated open
PR without merge-conflict, then do not consider other target branches.
The config allows for multiple target branches to be associated with
the same tag, for example:
"tag_to_branch_mapping": {
"tag": ["target1", "target2"]
}
Whenever a series is being synced, KPD tries to apply it to each
target branch in order, stopping at the first successful apply. Then
it opens/updates a tracking PR, and closes all other PRs for this
series.
This works fine most of the time. However, this logic may lead to
series suddenly switching branches. Example scenario:
* v1 successfully applied to target1, pr1 is created for it
* submitter receives CI report with v1 applied to target1
* v2 fails to apply to target1, but succeeds on target2
* KPD opens pr2 for target2, and closes pr1
* submitter receives CI report with v2 applied to target2 with no
indication that something happened
What should've happened in this case is pr1 labeled as
"merge-conflict" and target2 not tried.
The "stickiness" is implemented by checking existing PRs when
determining the list of target branches to apply the series to.
Signed-off-by: Ihor Solodrai <[email protected]>
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.
Implement "sticky" target branch: if a series has an associated open
PR without merge-conflict, then do not consider other target branches.
The config allows for multiple target branches to be associated with
the same tag, for example:
"tag_to_branch_mapping": {
"tag": ["target1", "target2"]
}
Whenever a series is being synced, KPD tries to apply it to each
target branch in order, stopping at the first successful apply. Then
it opens/updates a tracking PR, and closes all other PRs for this
series.
This works fine most of the time. However, this logic may lead to
series suddenly switching branches. Example scenario:
indication that something happened
What should've happened in this case is pr1 labeled as
"merge-conflict" and target2 not tried.
The "stickiness" is implemented by checking existing PRs when
determining the list of target branches to apply the series to.