ci: Update sync strategy for kernel-topic branches #30
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
Sync steps followed for kernel-topic branches: 1. Sync qcom-next 2. Merge topic branch on top of it 3. Merge PR This fails when topic branches are rebased on latest kernel version e.g. 6.19-rc2 and qcom-next is on older kernel e.g 6.18 Merge of topic branch to qcom-next fails. Update the sync strategy to use automerge as below : 1. Sync kernel repository 2. Run automerge taking baseline branch of kernel-topics as baseline 3. Merge PR under test on top of it This will ensure below 1. All changes are part of the merged branch. 2. Any dependent PR's not yet part of qcom-next will be covered here. Signed-off-by: Salendarsingh Gaud <sgaud@qti.qualcomm.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Sync steps followed for kernel-topic branches:
This fails when topic branches are rebased on latest kernel version e.g. 6.19-rc2 and qcom-next is on older kernel e.g 6.18 Merge of topic branch to qcom-next fails.
Update the sync strategy to use automerge as below :
This will ensure below