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

Upgrade to Humble + Garden #83

Closed
wants to merge 29 commits into from
Closed

Upgrade to Humble + Garden #83

wants to merge 29 commits into from

Conversation

chapulina
Copy link
Contributor

Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina chapulina marked this pull request as draft August 17, 2022 21:56
andermi and others added 4 commits August 23, 2022 10:24
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@srmainwaring
Copy link
Contributor

@chapulina I missed this PR while getting a version to build for macOS and duplicated the bulk of the work in #89 🙄.

I've closed that PR and extracted the main differences (which mostly have to do with dependencies on ros_gz_bridge and ros_gz_sim) into this commit srmainwaring@8c886be which was obtained after merging a fork of chapulina/humble_garden with main and resolving conflicts, so it should be suitable for cherry-picking into this branch once main has been merged in.

Happy to help with testing for macOS if you need it.

quarkytale and others added 6 commits September 7, 2022 11:38
Signed-off-by: Dharini Dutia <dharini@openrobotics.org>
Signed-off-by: Dharini Dutia <dharini@openrobotics.org>
- Update library and namespaces for ign -> gz migration.
- Use `python -m em` rather than `empy` for macOS support.
- Update dependencies to ros_gz_bridge and ros_gz_sim

Signed-off-by: Rhys Mainwaring <rhys.mainwaring@me.com>
Signed-off-by: Dharini Dutia <dharini@openrobotics.org>
Signed-off-by: Dharini Dutia <dharini@openrobotics.org>
@quarkytale
Copy link
Contributor

Updated with your commit @srmainwaring, made some small changes to fix the errors I was getting. This should be now ready, will iterate as required after Gazebo Garden release.

@quarkytale quarkytale marked this pull request as ready for review September 26, 2022 09:05
Signed-off-by: Michael Carroll <michael@openrobotics.org>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
@mjcarroll
Copy link
Collaborator

@andermi I'm down to one test that times out. The sc_commands_ros_feedback doesn't want to pass locally or in CI. In CI, I'm seeing a timeout. Locally, I'm seeing:

34: [sc_commands_ros_feedback-1] /home/mjcarroll/workspaces/mbari/src/buoy_sim/buoy_tests/tests/sc_commands_ros_feedback.cpp:412: Failure
34: [sc_commands_ros_feedback-1] Value of: static_cast<bool>(node->status_ & buoy_interfaces::msg::SCRecord::PUMP_TOGGLE)
34: [sc_commands_ros_feedback-1]   Actual: true
34: [sc_commands_ros_feedback-1] Expected: false
34: [sc_commands_ros_feedback-1] SC Pump Toggle should be OFF
34: [sc_commands_ros_feedback-1] /home/mjcarroll/workspaces/mbari/src/buoy_sim/buoy_tests/tests/sc_commands_ros_feedback.cpp:412: Failure
34: [sc_commands_ros_feedback-1] Value of: static_cast<bool>(node->status_ & buoy_interfaces::msg::SCRecord::PUMP_TOGGLE)
34: [sc_commands_ros_feedback-1]   Actual: true
34: [sc_commands_ros_feedback-1] Expected: false
34: [sc_commands_ros_feedback-1] SC Pump Toggle should be OFF

Signed-off-by: Michael Carroll <michael@openrobotics.org>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
Signed-off-by: Michael Carroll <michael@openrobotics.org>
@mjcarroll
Copy link
Collaborator

The only test failures here appear to be timeouts now @andermi

@andermi
Copy link
Collaborator

andermi commented Nov 30, 2022

The only test failures here appear to be timeouts now @andermi

I'll try the do-release-upgrade tomorrow and help you diagnose

@srmainwaring
Copy link
Contributor

@mjcarroll this is looking good on macOS as well. There is one catch which is that the header for gnuplot-iostream is not found on macOS - and this is now required for the build.

As a workaround I've created a ros2 / ament build of https://github.com/dstahlke/gnuplot-iostream on this branch
https://github.com/srmainwaring/gnuplot-iostream/tree/srmainwaring/ros2. With this package included in the workspace and a minor tweak in the form of srmainwaring@6ec250f the humble-garden branch builds on macOS (provided the other ros2 humble dependencies are all built).

I may have missed a ros2 package for gnuplot-iostream elsewhere, but if it's not available is there any interest in upstreaming one?

@chapulina
Copy link
Contributor Author

To be followed up on another PR

@chapulina chapulina closed this Dec 12, 2022
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.

5 participants