Fix 'microxrcedds_agent' name and dependency (backport #279) - #281
Merged
David-LP99 merged 2 commits intoSep 3, 2026
Merged
David-LP99 merged 2 commits into
David-LP99 merged 2 commits into
Conversation
Copy link
Copy Markdown
Contributor
Sorry, something went wrong.
* Fix 'microxrcedds_agent' name and dependency Signed-off-by: David Laseca Perez <davidlaseca@eprosima.com> * Set tag of 'microxrcedds_agent' Signed-off-by: David Laseca Perez <davidlaseca@eprosima.com> --------- Signed-off-by: David Laseca Perez <davidlaseca@eprosima.com> (cherry picked from commit 5e42d6a) # Conflicts: # micro_ros_agent/cmake/SuperBuild.cmake
Copy link
Copy Markdown
Contributor
Author
|
Cherry-pick of 5e42d6a has failed: On branch mergify/bp/jazzy/pr-279 Your branch is up to date with 'origin/jazzy'. You are currently cherry-picking commit 5e42d6a. (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) Changes to be committed: modified: micro_ros_agent/package.xml Unmerged paths: (use "git add <file>..." to mark resolution) both modified: micro_ros_agent/cmake/SuperBuild.cmake 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 |
Sorry, something went wrong.
Copy link
Copy Markdown
Contributor
Author
|
Tick the box to add this pull request to the merge queue (same as @mergifyio queue).
|
Sorry, something went wrong.
Signed-off-by: David Laseca Perez <davidlaseca@eprosima.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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 #237, the micro-ROS-Agent SuperBuild.cmake used to refer to the Micro-XRCE-DDS-Agent as xrceagent, which is inconsistent with the name exported by that package (microxrcedds_agent). In #237, the name and dependencies were updated, but not correctly (in line 24 the old name was kept), which caused some issues and was reverted on #239. The current approach works well for Vulcanexus, but can cause problems depending on the workspace configuration or build order.
This PR approaches this issue and tries to generate a consistent behaviour for building the package regardless of where the Micro-XRCE-DDS-Agent is coming from.
Main changes
This is an automatic backport of pull request Fix 'microxrcedds_agent' name and dependency #279 done by Mergify.