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

Fix backport for #3227 #3282

Open
wants to merge 1 commit into
base: mergify/bp/humble/pr-3227
Choose a base branch
from

Conversation

pac48
Copy link
Contributor

@pac48 pac48 commented Jan 29, 2025

No description provided.

Copy link

mergify bot commented Jan 29, 2025

This pull request is in conflict. Could you fix it @pac48?

Copy link

mergify bot commented Jan 29, 2025

Please target the main branch for development, we will backport the changes to mergify/bp/humble/pr-3227 for you if approved and if they don't break API.

@pac48 pac48 closed this Jan 29, 2025
@pac48 pac48 reopened this Jan 29, 2025
Copy link

mergify bot commented Jan 29, 2025

This pull request is in conflict. Could you fix it @pac48?

@pac48 pac48 force-pushed the mergify/bp/humble/pr-3227 branch 4 times, most recently from 6ba52b6 to 42b9ea2 Compare January 29, 2025 19:42
Signed-off-by: Paul Gesel <paul.gesel@picknik.ai>
@pac48 pac48 force-pushed the mergify/bp/humble/pr-3227 branch from 42b9ea2 to 14dbd17 Compare January 29, 2025 19:50
@pac48 pac48 marked this pull request as ready for review January 29, 2025 19:50
@sea-bass
Copy link
Contributor

Thanks @pac48! Seems the build is failing due to targets that don't exist on the humble branch. Might need to remove those.

https://github.com/moveit/moveit2/actions/runs/13039259023/job/36377097965?pr=3282#step:11:301

moveit_butterworth_filter_parameters
moveit_ruckig_filter
moveit_ruckig_filter_parameters
TARGETS
Copy link
Contributor

Choose a reason for hiding this comment

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

OK so here the acceleration and ruckig filters are not in the humble branch

moveit_kinematics_metrics
moveit_macros
Copy link
Contributor

Choose a reason for hiding this comment

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

This doesn't seem to be on Humble either

@pac48
Copy link
Contributor Author

pac48 commented Jan 30, 2025

Okay, I’ll take another look soon. The merge is definitely not trivia in this case due to all of the differences.

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