[21256] Fix issue with Fast DDS and Fast DDS python deduced branches #838
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
…ches Signed-off-by: JesusPoderoso <[email protected]>
|
@Mergifyio backport 2.14.x 2.13.x 2.10.x 2.6.x |
✅ Backports have been created
|
elianalf
approved these changes
Jul 2, 2024
mergify bot
pushed a commit
that referenced
this pull request
Jul 2, 2024
Signed-off-by: JesusPoderoso <[email protected]> (cherry picked from commit 6a53b9e) # Conflicts: # .github/workflows/reusable-ubuntu-ci.yml
mergify bot
pushed a commit
that referenced
this pull request
Jul 2, 2024
Signed-off-by: JesusPoderoso <[email protected]> (cherry picked from commit 6a53b9e) # Conflicts: # .github/workflows/reusable-ubuntu-ci.yml
This was referenced Jul 2, 2024
mergify bot
pushed a commit
that referenced
this pull request
Jul 2, 2024
Signed-off-by: JesusPoderoso <[email protected]> (cherry picked from commit 6a53b9e) # Conflicts: # .github/workflows/reusable-ubuntu-ci.yml
6 tasks
mergify bot
pushed a commit
that referenced
this pull request
Jul 2, 2024
Signed-off-by: JesusPoderoso <[email protected]> (cherry picked from commit 6a53b9e) # Conflicts: # .github/workflows/reusable-ubuntu-ci.yml
6 tasks
JesusPoderoso
added a commit
that referenced
this pull request
Jul 3, 2024
Signed-off-by: JesusPoderoso <[email protected]> (cherry picked from commit 6a53b9e)
JesusPoderoso
added a commit
that referenced
this pull request
Jul 3, 2024
Signed-off-by: JesusPoderoso <[email protected]> (cherry picked from commit 6a53b9e)
JesusPoderoso
added a commit
that referenced
this pull request
Jul 3, 2024
Signed-off-by: JesusPoderoso <[email protected]> (cherry picked from commit 6a53b9e)
JesusPoderoso
added a commit
that referenced
this pull request
Jul 3, 2024
Signed-off-by: JesusPoderoso <[email protected]> (cherry picked from commit 6a53b9e)
JesusPoderoso
added a commit
that referenced
this pull request
Jul 3, 2024
…839) Signed-off-by: JesusPoderoso <[email protected]> (cherry picked from commit 6a53b9e) Co-authored-by: Jesús Poderoso <[email protected]>
EduPonz
pushed a commit
that referenced
this pull request
Jul 3, 2024
…841) Signed-off-by: JesusPoderoso <[email protected]> (cherry picked from commit 6a53b9e) Co-authored-by: Jesús Poderoso <[email protected]>
EduPonz
pushed a commit
that referenced
this pull request
Jul 3, 2024
…842) Signed-off-by: JesusPoderoso <[email protected]> (cherry picked from commit 6a53b9e) Co-authored-by: Jesús Poderoso <[email protected]>
EduPonz
pushed a commit
that referenced
this pull request
Jul 3, 2024
…840) Signed-off-by: JesusPoderoso <[email protected]> (cherry picked from commit 6a53b9e) Co-authored-by: Jesús Poderoso <[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.
Description
In the previous PR
The Fast DDS and Fast DDS python related branches were not used as expected:
Instead of using the provided branch, it was downloading the .repos file from that branch (so the base reference was used instead of the desired branch).
This hotfix PR performs a checkout before downloading the repos included in the .repos file, so the actual branch used is the desired one.
In the case of the Fast DDS Python, its dependencies are already downloaded, so there is no need to download them. It has been changed to just cloning that repo and checking out to the desired branch.
Important: when fixing the conflicts in the backports, please ensure:
fastdds.repostofastrtps.repossrc/fastddstosrc/fastrtps@Mergifyio backport 2.14.x 2.13.x 2.10.x 2.6.x
Contributor Checklist
Reviewer Checklist