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 tests for interface_configuration_type consistently (backport #899) #1007

Merged
merged 4 commits into from
Feb 1, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 31, 2024

This is an automatic backport of pull request #899 done by Mergify.
Cherry-pick of f2f36c0 has failed:

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

You are currently cherry-picking commit f2f36c0.
  (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/test/test_ackermann_steering_controller.cpp
	modified:   ackermann_steering_controller/test/test_ackermann_steering_controller.hpp
	modified:   ackermann_steering_controller/test/test_ackermann_steering_controller_preceeding.cpp
	modified:   admittance_controller/test/test_admittance_controller.cpp
	modified:   bicycle_steering_controller/test/test_bicycle_steering_controller.cpp
	modified:   bicycle_steering_controller/test/test_bicycle_steering_controller.hpp
	modified:   bicycle_steering_controller/test/test_bicycle_steering_controller_preceeding.cpp
	modified:   diff_drive_controller/test/test_diff_drive_controller.cpp
	modified:   force_torque_sensor_broadcaster/test/test_force_torque_sensor_broadcaster.cpp
	modified:   forward_command_controller/test/test_forward_command_controller.cpp
	modified:   forward_command_controller/test/test_multi_interface_forward_command_controller.cpp
	modified:   imu_sensor_broadcaster/test/test_imu_sensor_broadcaster.cpp
	modified:   joint_state_broadcaster/test/test_joint_state_broadcaster.cpp
	modified:   joint_trajectory_controller/test/test_trajectory_controller.cpp
	modified:   range_sensor_broadcaster/test/test_range_sensor_broadcaster.cpp
	modified:   steering_controllers_library/test/test_steering_controllers_library.cpp
	modified:   steering_controllers_library/test/test_steering_controllers_library.hpp
	modified:   tricycle_steering_controller/test/test_tricycle_steering_controller.cpp
	modified:   tricycle_steering_controller/test/test_tricycle_steering_controller.hpp
	modified:   tricycle_steering_controller/test/test_tricycle_steering_controller_preceeding.cpp

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

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 f2f36c0)

# Conflicts:
#	pid_controller/test/test_pid_controller.cpp
#	pid_controller/test/test_pid_controller_preceding.cpp
@mergify mergify bot added the conflicts label Jan 31, 2024
@bmagyar bmagyar merged commit 5f2279b into iron Feb 1, 2024
10 of 13 checks passed
@bmagyar bmagyar deleted the mergify/bp/iron/pr-899 branch February 1, 2024 18:03
henrygerardmoore pushed a commit to henrygerardmoore/ros2_controllers that referenced this pull request Jul 19, 2024
…#1007)

* [CI] Use clangformat hhok and don't install it manually

* Don't install manually clang-format
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