[sonic-frr/Makefile]: Checkout gracefully if branch exists already. #8289
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
This is useful to avoid "branch exists" error while rebuild FRR. Signed-off-by: Praveen Chaudhary<[email protected]>
shi-su
reviewed
Aug 3, 2021
Signed-off-by: Praveen Chaudhary <[email protected]>
shi-su
approved these changes
Aug 11, 2021
praveen-li
pushed a commit
to praveen-li/sonic-buildimage
that referenced
this pull request
Feb 15, 2022
…#8289) If branch exist already, today FRR build fails. Branch may exist on rebuild. With this PR, we will Checkout branch gracefully if branch exists already. Signed-off-by: Praveen Chaudhary<[email protected]>
mssonicbld
pushed a commit
to mssonicbld/sonic-buildimage
that referenced
this pull request
Jun 12, 2023
…#8289) If branch exist already, today FRR build fails. Branch may exist on rebuild. With this PR, we will Checkout branch gracefully if branch exists already. Signed-off-by: Praveen Chaudhary<[email protected]>
|
Cherry-pick PR to 202106: #15434 |
Merged
5 tasks
|
Approve for 202106 branch to avoid build failure. |
mssonicbld
added a commit
that referenced
this pull request
Jun 12, 2023
mssonicbld
added
Included in 202106 Branch
and removed
Approved for 202106 Branch
Created PR to 202106 Branch
labels
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.
This is useful to avoid "branch exists" error while rebuild FRR.
Signed-off-by: Praveen Chaudhary[email protected]
Why I did it
If branch exist already, today FRR build fails. Branch may exist on rebuild.
With this PR, we will Checkout branch gracefully if branch exists already.
How I did it
Use git checkout$(FRR_BRANCH) || git checkout -b $ (FRR_BRANCH) origin/$(FRR_BRANCH) in src/sonic-frr/Makefile.
How to verify it
Rebuild works fine. Fresh build works fine as well.
Which release branch to backport (provide reason below if selected)
Description for the changelog
A picture of a cute animal (not mandatory but encouraged)