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

Allow empty urdf tag (backport #1017) #1030

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 19, 2023

This is an automatic backport of pull request #1017 done by Mergify.
Cherry-pick of 7c07430 has failed:

On branch mergify/bp/humble/pr-1017
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit 7c07430.
  (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:   hardware_interface/test/test_component_parser.cpp
	modified:   ros2_control_test_assets/include/ros2_control_test_assets/components_urdfs.hpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hardware_interface/src/component_parser.cpp

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* Do not explode with empty tag
* Update tests to allow empty URDF parameter to hardware interface
* Test checks that empty parameter tags work and actually checks the parsed urdf.

---------

Co-authored-by: Bence Magyar <[email protected]>
Co-authored-by: Dr. Denis <[email protected]>
(cherry picked from commit 7c07430)

# Conflicts:
#	hardware_interface/src/component_parser.cpp
@fmauch
Copy link
Contributor

fmauch commented May 22, 2023

As with #1029 there seem to have been problems while creating the backport using mergify.

@destogl
Copy link
Member

destogl commented May 30, 2023

Closing in favor of #1036

@destogl destogl closed this May 30, 2023
@mergify mergify bot deleted the mergify/bp/humble/pr-1017 branch May 30, 2023 13:09
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