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

Update paths of GPL includes (backport #1487) #1493

Merged
merged 1 commit into from
Jan 16, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 15, 2025

Needs release 0.4.0
for reference, see PickNikRobotics/generate_parameter_library#213


This is an automatic backport of pull request #1487 done by Mergify.

Copy link
Contributor Author

mergify bot commented Jan 15, 2025

Cherry-pick of bfe622c has failed:

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

You are currently cherry-picking commit bfe622c.
  (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:   joint_trajectory_controller/include/joint_trajectory_controller/tolerances.hpp
	modified:   ros2_controllers-not-released.jazzy.repos
	modified:   ros2_controllers-not-released.rolling.repos

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   ackermann_steering_controller/include/ackermann_steering_controller/ackermann_steering_controller.hpp
	both modified:   admittance_controller/include/admittance_controller/admittance_controller.hpp
	both modified:   admittance_controller/include/admittance_controller/admittance_rule.hpp
	both modified:   bicycle_steering_controller/include/bicycle_steering_controller/bicycle_steering_controller.hpp
	both modified:   diff_drive_controller/include/diff_drive_controller/diff_drive_controller.hpp
	both modified:   force_torque_sensor_broadcaster/include/force_torque_sensor_broadcaster/force_torque_sensor_broadcaster.hpp
	both modified:   forward_command_controller/include/forward_command_controller/forward_command_controller.hpp
	both modified:   forward_command_controller/include/forward_command_controller/multi_interface_forward_command_controller.hpp
	both modified:   gpio_controllers/include/gpio_controllers/gpio_command_controller.hpp
	both modified:   gripper_controllers/include/gripper_controllers/gripper_action_controller.hpp
	both modified:   imu_sensor_broadcaster/include/imu_sensor_broadcaster/imu_sensor_broadcaster.hpp
	both modified:   joint_state_broadcaster/include/joint_state_broadcaster/joint_state_broadcaster.hpp
	both modified:   joint_trajectory_controller/include/joint_trajectory_controller/joint_trajectory_controller.hpp
	deleted by us:   mecanum_drive_controller/include/mecanum_drive_controller/mecanum_drive_controller.hpp
	deleted by us:   parallel_gripper_controller/include/parallel_gripper_controller/parallel_gripper_action_controller.hpp
	both modified:   pid_controller/include/pid_controller/pid_controller.hpp
	both modified:   pose_broadcaster/include/pose_broadcaster/pose_broadcaster.hpp
	both modified:   range_sensor_broadcaster/include/range_sensor_broadcaster/range_sensor_broadcaster.hpp
	both modified:   steering_controllers_library/include/steering_controllers_library/steering_controllers_library.hpp
	both modified:   tricycle_controller/include/tricycle_controller/tricycle_controller.hpp
	both modified:   tricycle_steering_controller/include/tricycle_steering_controller/tricycle_steering_controller.hpp

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 mergify bot added the conflicts label Jan 15, 2025
Copy link

codecov bot commented Jan 16, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 66.77%. Comparing base (82b6965) to head (973031e).
Report is 1 commits behind head on humble.

Additional details and impacted files
@@            Coverage Diff             @@
##           humble    #1493      +/-   ##
==========================================
+ Coverage   66.76%   66.77%   +0.01%     
==========================================
  Files         113      114       +1     
  Lines       13376    13409      +33     
  Branches     8274     8291      +17     
==========================================
+ Hits         8930     8954      +24     
- Misses       1439     1440       +1     
- Partials     3007     3015       +8     
Flag Coverage Δ
unittests 66.77% <ø> (+0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
.../include/admittance_controller/admittance_rule.hpp 100.00% <ø> (ø)
...de/diff_drive_controller/diff_drive_controller.hpp 100.00% <ø> (ø)
...jectory_controller/joint_trajectory_controller.hpp 100.00% <ø> (ø)
...include/joint_trajectory_controller/tolerances.hpp 80.86% <ø> (ø)
...nclude/tricycle_controller/tricycle_controller.hpp 100.00% <ø> (ø)

... and 4 files with indirect coverage changes

@christophfroehlich christophfroehlich merged commit 3e292ba into humble Jan 16, 2025
10 of 13 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/humble/pr-1487 branch January 16, 2025 08:22
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.

1 participant