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

Merged

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 <[email protected]>
@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_core/CMakeLists.txt Show resolved Hide resolved
moveit_core/CMakeLists.txt Outdated Show resolved Hide resolved
@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.

@sea-bass
Copy link
Contributor

sea-bass commented Feb 2, 2025

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

I just gave this a try and think I got it building.

Note to build locally I also cherry-picked #3296, which will be merged in first, so don't worry about the eigen_stl_containers stuff.

@sea-bass sea-bass merged commit afac11d into moveit:mergify/bp/humble/pr-3227 Feb 2, 2025
4 of 7 checks passed
@codecov-commenter
Copy link

⚠️ Please install the 'codecov app svg image' to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 0.00%. Comparing base (fcd9ce7) to head (6872e7c).
Report is 1 commits behind head on mergify/bp/humble/pr-3227.

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files
@@                Coverage Diff                @@
##   mergify/bp/humble/pr-3227   #3282   +/-   ##
=================================================
=================================================

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

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.

3 participants