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

Add additional checks for non existing and not available interfaces. (backport #1218) #1292

Merged
merged 8 commits into from
Jan 17, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 12, 2024

This is an automatic backport of pull request #1218 done by Mergify.
Cherry-pick of 8c34ab6 has failed:

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

You are currently cherry-picking commit 8c34ab6.
  (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/CMakeLists.txt
	modified:   hardware_interface/include/hardware_interface/resource_manager.hpp
	modified:   hardware_interface/src/resource_manager.cpp
	modified:   hardware_interface/test/test_components/test_actuator.cpp
	modified:   hardware_interface/test/test_hardware_components/test_system_with_command_modes.cpp
	modified:   hardware_interface/test/test_resource_manager.cpp
	new file:   hardware_interface/test/test_resource_manager.hpp
	new file:   hardware_interface/test/test_resource_manager_prepare_perform_switch.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hardware_interface/test/mock_components/test_generic_system.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

…1218)

(cherry picked from commit 8c34ab6)

# Conflicts:
#	hardware_interface/test/mock_components/test_generic_system.cpp
@mergify mergify bot added the conflicts label Jan 12, 2024
@bmagyar bmagyar removed the conflicts label Jan 13, 2024
@destogl destogl merged commit d27bc21 into iron Jan 17, 2024
12 checks passed
@destogl destogl deleted the mergify/bp/iron/pr-1218 branch January 17, 2024 15:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants