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

Don't use ament_export_targets from package sub folder (backport #1889) #1893

Merged
merged 3 commits into from
Aug 23, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jan 26, 2023

This is an automatic backport of pull request #1889 done by Mergify.
Cherry-pick of da0b248 has failed:

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

You are currently cherry-picking commit da0b24802.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of acda563 has failed:

On branch mergify/bp/humble/pr-1889
Your branch is ahead of 'origin/humble' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit acda5636b.
  (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/CMakeLists.txt

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   moveit_core/collision_detection_bullet/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

@mergify mergify bot added the conflicts label Jan 26, 2023
@henningkayser
Copy link
Member

@tylerjw would you have time to address the conflicts?

@tylerjw tylerjw self-assigned this Aug 23, 2023
(cherry picked from commit da0b248)

# Conflicts:
#	moveit_core/CMakeLists.txt
(cherry picked from commit acda563)

# Conflicts:
#	moveit_core/collision_detection_bullet/CMakeLists.txt
Copy link
Member

@tylerjw tylerjw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed up this backport and tested locally. I'll merge if CI passes.

@tylerjw tylerjw removed the conflicts label Aug 23, 2023
@codecov
Copy link

codecov bot commented Aug 23, 2023

Codecov Report

Patch coverage has no change and project coverage change: -0.01% ⚠️

Comparison is base (a1789ff) 50.95% compared to head (59dcbc7) 50.94%.

Additional details and impacted files
@@            Coverage Diff             @@
##           humble    #1893      +/-   ##
==========================================
- Coverage   50.95%   50.94%   -0.01%     
==========================================
  Files         382      382              
  Lines       31889    31889              
==========================================
- Hits        16246    16242       -4     
- Misses      15643    15647       +4     

see 1 file with indirect coverage changes

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

@tylerjw tylerjw merged commit b9ef75d into humble Aug 23, 2023
6 checks passed
@tylerjw tylerjw deleted the mergify/bp/humble/pr-1889 branch August 23, 2023 20:37
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.

None yet

2 participants