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

Use find_package for fcl (backport #2399) #2400

Merged
merged 2 commits into from
Oct 3, 2023
Merged

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 29, 2023

This is an automatic backport of pull request #2399 done by Mergify.
Cherry-pick of 498a9f3 has failed:

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

You are currently cherry-picking commit 498a9f3d6.
  (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:   moveit_core/collision_detection_fcl/CMakeLists.txt

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   moveit_core/CMakeLists.txt

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/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 498a9f3)

# Conflicts:
#	moveit_core/CMakeLists.txt
@mergify mergify bot added the conflicts label Sep 29, 2023
@codecov
Copy link

codecov bot commented Sep 29, 2023

Codecov Report

All modified lines are covered by tests ✅

Comparison is base (5dd0d5e) 50.95% compared to head (4d72c54) 50.95%.

Additional details and impacted files
@@           Coverage Diff           @@
##           humble    #2400   +/-   ##
=======================================
  Coverage   50.95%   50.95%           
=======================================
  Files         382      382           
  Lines       31889    31889           
=======================================
  Hits        16246    16246           
  Misses      15643    15643           

see 3 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@sjahr sjahr merged commit b41628a into humble Oct 3, 2023
@sjahr sjahr deleted the mergify/bp/humble/pr-2399 branch October 3, 2023 06:29
JeisonUR added a commit to Unlimited-Robotics/moveit2 that referenced this pull request Dec 29, 2023
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.

3 participants