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

Codeformat from new pre-commit config (backport #1433) #1437

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 11, 2024

This is an automatic backport of pull request #1433 done by Mergify.
Cherry-pick of 591b06c has failed:

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

You are currently cherry-picking commit 591b06c.
  (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:   controller_manager/test/test_controller_manager_srvs.cpp
	modified:   controller_manager/test/test_spawner_unspawner.cpp
	modified:   hardware_interface/test/test_hardware_components/test_force_torque_sensor.cpp
	modified:   joint_limits/include/joint_limits/joint_limits.hpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   rqt_controller_manager/rqt_controller_manager/controller_manager.py

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 591b06c)

# Conflicts:
#	rqt_controller_manager/rqt_controller_manager/controller_manager.py
@mergify mergify bot added the conflicts label Mar 11, 2024
Copy link
Contributor Author

mergify bot commented Mar 11, 2024

Cherry-pick of 591b06c has failed:

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

You are currently cherry-picking commit 591b06c.
  (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:   controller_manager/test/test_controller_manager_srvs.cpp
	modified:   controller_manager/test/test_spawner_unspawner.cpp
	modified:   hardware_interface/test/test_hardware_components/test_force_torque_sensor.cpp
	modified:   joint_limits/include/joint_limits/joint_limits.hpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   rqt_controller_manager/rqt_controller_manager/controller_manager.py

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

Copy link

codecov bot commented Mar 11, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 75.52%. Comparing base (41e61bc) to head (48b4648).

Additional details and impacted files
@@           Coverage Diff           @@
##             iron    #1437   +/-   ##
=======================================
  Coverage   75.52%   75.52%           
=======================================
  Files          42       42           
  Lines        3371     3371           
  Branches     1943     1940    -3     
=======================================
  Hits         2546     2546           
+ Misses        442      441    -1     
- Partials      383      384    +1     
Flag Coverage Δ
unittests 75.52% <ø> (ø)

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

see 1 file with indirect coverage changes

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.

1 participant