-
Couldn't load subscription status.
- Fork 373
Fix CMake install so overriding works (backport #926) #2480
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
Conversation
Signed-off-by: Tyler Weaver <[email protected]> (cherry picked from commit 727297e) # Conflicts: # controller_interface/CMakeLists.txt # controller_interface/package.xml # controller_manager/CMakeLists.txt # controller_manager/package.xml # hardware_interface/CMakeLists.txt # joint_limits/CMakeLists.txt # ros2_control_test_assets/CMakeLists.txt # transmission_interface/CMakeLists.txt
|
Cherry-pick of 727297e has failed: 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 |
|
@christophfroehlich I fixed some of the CI issues with #2482, but I cannot run the full CI pipeline there, and I also cannot propose changes to your PR branch this way. Can you cherry-pick my commit to your PR and trigger the CI again? |
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## humble #2480 +/- ##
==========================================
+ Coverage 63.67% 63.69% +0.02%
==========================================
Files 112 112
Lines 12933 12933
Branches 8735 8738 +3
==========================================
+ Hits 8235 8238 +3
+ Misses 806 804 -2
+ Partials 3892 3891 -1
Flags with carried forward coverage won't be shown. Click here to find out more. 🚀 New features to boost your workflow:
|
|
I can confirm that the There is only on test failure left. This is on Red Hat, or AlmaLinux respectively, which I cannot reproduce locally or in CI. Given that this PR is 5 commits behind the current @christophfroehlich Can we go ahead with this PR? |
|
The failing RHEL job is known and not related. @bmagyar @saikishor do you see problems in backporting this? |
I think it should be fine |
|
Let me check this in the morning on a bigger screen :) |
|
@christophfroehlich how close is this to the original changeset? I think we should update the title as this isn't primarily a fix for overrides anymore but migrating to modern cmake targets. |
|
It is as close as we were able to fix the merge conflicts and apply the changes in a meaningful way ;) |
I think @bmagyar meant, how related are the new commits to the original intent of the PR. Originally, this PR was just a backport of #926. But we added a couple of new commits. The commits I added were necessary fixes to have the CI pass. @christophfroehlich are the commits you added required for this backport PR? Or could they be moved to another dedicated PR? |
|
some of them where unintentional removals while trying to fix the merge conflicts, only the last one is "new" |
Do we need all your commits on this PR branch? As far as I remember, up to and including my last commit 979d069, the CI was passing all pipelines, except the "RHEL" workflow, and this one still fails. @christophfroehlich Can you move your commits after mine to a separate PR? This way, we can continue with this pure "backport + test fixes" PR here. |
|
if tests were deactivated, how should the Ci complain.. |
|
If the tests were deactivated before this PR, doesn't it mean they should stay this way? Or do you mean that the backport deactivated the tests, and you activated them again? I.e. were you reverting some of the changes done in the first commit 1c9ffcf? Sorry, if I did not see that. |
|
Exactly, the backport had lots of merge conflicts because the master branch from the time of the PR to be backported already diverted a lot to the current humble branch; And I accidentally removed them with the first merge-conflict-fix-commit. Summarized: The same tests from the current humble head are activate in this PR now. |
|
I see. Thanks for clarifying. In this case, I think we can stick with the PR title as the functional changes are the ones that are back ported and every thing else is just fixes for the backport itself. @bmagyar Are you ok with this? Can we go ahead with merging the PR? |
|
We need to make sure to not break any downstream packages. We are currently trying to get the prerelease checks from ROS 1 buildfarm running |
|
#2502 nmea_hardware_interface failed. I can check later if this is related to this pr. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It fails because the switches depending on environment variables fails, it tries to find the rolling version.
https://github.com/OUXT-Polaris/nmea_hardware_interface/blob/1d49893cc5e21ad8feadcfe2dc161236413ea883/include/nmea_hardware_interface/gps_hardware_interface.hpp#L21-L25
All other level 1 dependencies build successfully.
|
If we break anything, they will roll our release back. We need to have a fix for the referenced package above released first. |
|
it is red on the buildfarm anyways, maybe never was green |
|
Yeah it seems it's been a while since it was maintained. Let's try then |
Description
This is related to:
Here are the colcon docs on overriding: https://colcon.readthedocs.io/en/released/user/overriding-packages.html#how-to-make-it-easier-for-your-users-to-override
Here is the ament_cmake user guide: https://docs.ros.org/en/rolling/How-To-Guides/Ament-CMake-Documentation.html
These changes have been tested locally and are in line with the changes we have been making to CMake for MoveIt. There are a few goals here:
One thing I did not do is turn on
-Werroror increase the warning set when building this library. Given the time I'll follow up with PRs that fix the warnings and turn on-Werror.This is an automatic backport of pull request #926 done by Mergify.