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 test_depend on hardware_interface_testing (backport #1018) #1020

Merged
merged 3 commits into from Feb 5, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 5, 2024

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

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

You are currently cherry-picking commit 8bf379b.
  (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:   ackermann_steering_controller/package.xml
	modified:   admittance_controller/package.xml
	modified:   bicycle_steering_controller/package.xml
	modified:   diff_drive_controller/test/test_load_diff_drive_controller.cpp
	modified:   effort_controllers/package.xml
	modified:   effort_controllers/test/test_load_joint_group_effort_controller.cpp
	modified:   force_torque_sensor_broadcaster/package.xml
	modified:   forward_command_controller/package.xml
	modified:   gripper_controllers/package.xml
	modified:   gripper_controllers/test/test_load_gripper_action_controllers.cpp
	modified:   imu_sensor_broadcaster/package.xml
	modified:   joint_state_broadcaster/package.xml
	modified:   joint_trajectory_controller/package.xml
	modified:   position_controllers/package.xml
	modified:   position_controllers/test/test_load_joint_group_position_controller.cpp
	modified:   range_sensor_broadcaster/package.xml
	modified:   tricycle_controller/package.xml
	modified:   tricycle_controller/test/test_load_tricycle_controller.cpp
	modified:   tricycle_steering_controller/package.xml
	modified:   velocity_controllers/package.xml
	modified:   velocity_controllers/test/test_load_joint_group_velocity_controller.cpp

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   pid_controller/package.xml

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


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

(cherry picked from commit 8bf379b)

# Conflicts:
#	pid_controller/package.xml
@mergify mergify bot added the conflicts label Feb 5, 2024
@bmagyar bmagyar merged commit b0236b1 into iron Feb 5, 2024
11 of 13 checks passed
@bmagyar bmagyar deleted the mergify/bp/iron/pr-1018 branch February 5, 2024 10:03
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.

None yet

2 participants