Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[21256] Fix issue with Fast DDS and Fast DDS python deduced branches (backport #838) #839

Merged
merged 1 commit into from
Jul 3, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jul 2, 2024

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:

  • Change fastdds.repos to fastrtps.repos
  • change src/fastdds to src/fastrtps

@Mergifyio backport 2.14.x 2.13.x 2.10.x 2.6.x

Contributor Checklist

  • Commit messages follow the project guidelines.
  • N/A Code snippets related to the added documentation have been provided.
  • N/A Documentation tests pass locally.
  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • CI passes without warnings or errors.

This is an automatic backport of pull request #838 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts label Jul 2, 2024
Copy link
Author

mergify bot commented Jul 2, 2024

Cherry-pick of 6a53b9e has failed:

On branch mergify/bp/2.14.x/pr-838
Your branch is up to date with 'origin/2.14.x'.

You are currently cherry-picking commit 6a53b9e.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/reusable-ubuntu-ci.yml

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
(cherry picked from commit 6a53b9e)
Copy link
Contributor

@JesusPoderoso JesusPoderoso left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM with green CI

@JesusPoderoso JesusPoderoso merged commit 4c9f454 into 2.14.x Jul 3, 2024
4 checks passed
@JesusPoderoso JesusPoderoso deleted the mergify/bp/2.14.x/pr-838 branch July 3, 2024 09:32
@EduPonz EduPonz modified the milestones: v2.14.3, v2.14.2 Jul 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants