[20989] Set fallback branch for get_related_branch_from_repo correctly (backport #4816) #4847
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
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
Signed-off-by: eduponz <[email protected]> (cherry picked from commit e317234)
7 tasks
Mario-DL
added
ready-to-merge
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.
Description
Before this PR, when running the Ubuntu CI manually, if the
input.fastdds-branchdid not exist on ShapesDemo, the job fails, as theinput.fastdds-branchis used as fallback branch for callingget_related_branch_from_repofor ShapesDemo.In fact, it the PR is to an intermediate branch without a corresponding ShapesDemo branch, the job will also fail. The reason why it was not failing in normal PRs is that before the fallback check, the action checks for the existence on the base branch from the PR, and as ShapesDemo branching model is the same as Fast DDS' it was using the basing without having to check the fallback.
With this PR, the fallback branch is explicitly set on the reusable workflow so when running manual dispatching, the fallback branch is valid.
@Mergifyio backport 2.14.x 2.13.x 2.10.x 2.6.x
IMPORTANT: The fallback needs to be adjusted in the backports
Contributor Checklist
Commit messages follow the project guidelines.
N/A: The code follows the style guidelines of this project.
N/A: Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally
N/A: Any new/modified methods have been properly documented using Doxygen.
N/A: Any new configuration API has an equivalent XML API (with the corresponding XSD extension)
N/A: Changes are backport compatible: they do NOT break ABI nor change library core behavior.
N/A: Changes are API compatible.
N/A: New feature has been added to the
versions.mdfile (if applicable).N/A: New feature has been documented/Current behavior is correctly described in the documentation.
Applicable backports have been included in the description.
Reviewer Checklist
This is an automatic backport of pull request #4816 done by [Mergify](https://mergify.com).