ci: workflows: remove rebase-merge folder before rebase #82227
Merged
Conversation
This file contains 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
With gitv2.26, git rebase uses "git merge" mechanism instead of "git apply". This creates a rebase-merge folder in .git, in case of rebase conflict. This caused problems in self hosted runners due to old rebase-merge folder. This commit deletes this folder before git rebase action. Signed-off-by: Mert Ekren <[email protected]>
zephyrbot
added
platform: nRF BSIM
zephyrbot
requested review from
aescolar,
fabiobaltieri,
kartben,
nashif and
stephanosio
fabiobaltieri
approved these changes
Nov 28, 2024
MaureenHelm
approved these changes
Dec 4, 2024
|
Is there anything needed for this PR? I think this is merge-ready. Thanks |
nashif
approved these changes
Dec 16, 2024
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.
We've seen that some workflows can create phantom rebase-merge folder that doesn't get cleaned. This commit removes possible rebase-merge folder pre-rebase. This is from ADI self hosted-runner:
We've seen that with this commit deletes the folder pre-rebase
More info:
with git v2.26, there's a change that : "Previously git rebase used the “apply” backend. In 2.26, both git rebase and git rebase -i now both use the “merge” backend. " from: https://github.blog/open-source/git/highlights-from-git-2-26/
Runners use newer git versions (v2.30+). In these versions, rebase conflicts create "rebase-merge" folder to fix option, not "rebase-apply".