Skip to content

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jul 22, 2025

See #156 (comment)

Fixes #156


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

(cherry picked from commit f2fa8f0)

# Conflicts:
#	doc/migration.rst
#	doc/release_notes.rst
@mergify mergify bot added the conflicts label Jul 22, 2025
Copy link
Author

mergify bot commented Jul 22, 2025

Cherry-pick of f2fa8f0 has failed:

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

You are currently cherry-picking commit f2fa8f0.
  (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:   control_toolbox/include/control_toolbox/pid_ros.hpp
	modified:   control_toolbox/src/pid_ros.cpp
	modified:   control_toolbox/test/pid_ros_parameters_tests.cpp
	modified:   control_toolbox/test/pid_ros_publisher_tests.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   doc/migration.rst
	both modified:   doc/release_notes.rst

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

@codecov-commenter
Copy link

Codecov Report

Attention: Patch coverage is 95.59748% with 7 lines in your changes missing coverage. Please review.

Project coverage is 76.23%. Comparing base (44eaf81) to head (3116e69).

Files with missing lines Patch % Lines
control_toolbox/test/pid_ros_publisher_tests.cpp 93.90% 0 Missing and 5 partials ⚠️
control_toolbox/src/pid_ros.cpp 93.33% 1 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##            jazzy     #434      +/-   ##
==========================================
- Coverage   76.63%   76.23%   -0.40%     
==========================================
  Files          29       29              
  Lines        1947     2066     +119     
  Branches      114      125      +11     
==========================================
+ Hits         1492     1575      +83     
- Misses        383      420      +37     
+ Partials       72       71       -1     
Flag Coverage Δ
unittests 76.23% <95.59%> (-0.40%) ⬇️

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

Files with missing lines Coverage Δ
...ontrol_toolbox/include/control_toolbox/pid_ros.hpp 100.00% <100.00%> (ø)
control_toolbox/test/pid_ros_parameters_tests.cpp 100.00% <100.00%> (ø)
control_toolbox/src/pid_ros.cpp 58.63% <93.33%> (-5.34%) ⬇️
control_toolbox/test/pid_ros_publisher_tests.cpp 94.65% <93.90%> (-1.50%) ⬇️
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@christophfroehlich christophfroehlich merged commit c36f9d2 into jazzy Jul 22, 2025
12 of 13 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/jazzy/pr-431 branch July 22, 2025 07:08
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