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

Bump version of pre-commit hooks (backport #1514) #1515

Merged
merged 2 commits into from
Feb 1, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 1, 2025

This pull request contains auto-updated files of the pre-commit config. @ros-controls/ros2-maintainers please run the pre-commit workflow manually on the branch auto-update- before merging.


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

(cherry picked from commit 694d6f1)

# Conflicts:
#	parallel_gripper_controller/include/parallel_gripper_controller/parallel_gripper_action_controller.hpp
Copy link
Contributor Author

mergify bot commented Feb 1, 2025

Cherry-pick of 694d6f1 has failed:

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

You are currently cherry-picking commit 694d6f1.
  (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:   .pre-commit-config.yaml
	modified:   gripper_controllers/include/gripper_controllers/gripper_action_controller.hpp

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   parallel_gripper_controller/include/parallel_gripper_controller/parallel_gripper_action_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 Feb 1, 2025
@christophfroehlich christophfroehlich merged commit f5c4c3c into humble Feb 1, 2025
12 of 13 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/humble/pr-1514 branch February 1, 2025 10:40
Copy link

codecov bot commented Feb 1, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 66.76%. Comparing base (3e292ba) to head (4f77086).
Report is 6 commits behind head on humble.

Additional details and impacted files
@@            Coverage Diff             @@
##           humble    #1515      +/-   ##
==========================================
- Coverage   66.79%   66.76%   -0.03%     
==========================================
  Files         114      114              
  Lines       13409    13409              
  Branches     8289     8291       +2     
==========================================
- Hits         8956     8953       -3     
+ Misses       1440     1434       -6     
- Partials     3013     3022       +9     
Flag Coverage Δ
unittests 66.76% <ø> (-0.03%) ⬇️

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

see 3 files with indirect coverage changes

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