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.

Sign up for GitHub

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

Jump to bottom

Add support for Harmonic/Humble pairing #462

Merged
merged 7 commits into from
Nov 15, 2023
Merged

Add support for Harmonic/Humble pairing #462

merged 7 commits into from
Nov 15, 2023

Conversation

azeey
Copy link
Contributor

@azeey azeey commented Nov 14, 2023 •
edited
Loading

Fixes #461

Summary

Cherry-picks #447 and #448, update headers (3853cf2) and namespaces ( 66b61f2) and makes some tweaks to CMake and package.xml so that the humble branch can be built with Harmonic as well as Fortress.

Checklist

  • Signed all commits for DCO
  • Added tests
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • Consider updating Python bindings (if the library has them)
  • codecheck passed (See contributing)
  • All tests passed (See test coverage)
  • While waiting for a review on your PR, please help review another open pull request to support the maintainers

Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining Signed-off-by messages.

mjcarroll and others added 6 commits November 14, 2023 12:12
@mjcarroll @azeey
Add harmonic CI (#447)
e7b1824 
* Add harmonic CI

Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>

* Include garden options

Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>

* Add harmonic stanza

Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>

* Additional message headers

Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>

---------

Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
@j-rivero @azeey
Use stable osrf repo for Garden and stable+prerelease for Harmonic (#448
664c74b 
)

Harmonic is now in the prerelease repository

Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
@azeey
Add additional cmake/package.xml changes
682dd66 
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
@azeey
Update headers
3853cf2 
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
@azeey
Update namespaces
66b61f2 
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
@azeey
Add ci for harmonic/humble
04b4385 
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
@azeey azeey mentioned this pull request Nov 14, 2023
Closed
bperseghetti
bperseghetti approved these changes Nov 15, 2023
View reviewed changes
Copy link
Collaborator

@bperseghetti bperseghetti left a comment

Choose a reason for hiding this comment

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

Looks good, I would maybe suggest adding edits to the README.md though for harmonic as it's currently not listing Garden and hopefully soon Harmonic for Humble.

ROS 2 version Gazebo version Branch Binaries hosted at
Foxy Citadel foxy https://packages.ros.org
Foxy Edifice foxy only from source
Galactic Edifice galactic https://packages.ros.org
Galactic Fortress galactic only from source
Humble Fortress humble https://packages.ros.org
Humble Garden humble gazebo packages
Humble Harmonic humble gazebo packages
Rolling Edifice ros2 only from source
Rolling Fortress ros2 https://packages.ros.org
Rolling Garden ros2 only from source

@bperseghetti
Copy link
Collaborator

bperseghetti commented Nov 15, 2023 •
edited
Loading

Looks good, I would maybe suggest adding edits to the README.md though for harmonic as it's currently not listing Garden and hopefully soon Harmonic for Humble.

ROS 2 version Gazebo version Branch Binaries hosted at
Foxy Citadel foxy https://packages.ros.org
Foxy Edifice foxy only from source
Galactic Edifice galactic https://packages.ros.org
Galactic Fortress galactic only from source
Humble Fortress humble https://packages.ros.org
Humble Garden humble gazebo packages
Humble Harmonic humble gazebo packages
Rolling Edifice ros2 only from source
Rolling Fortress ros2 https://packages.ros.org
Rolling Garden ros2 only from source

I should also mention that's what I think the README.md should look like.

Basically adding/editing:

Humble | Garden | [humble](https://github.com/gazebosim/ros_gz/tree/humble) | [gazebo packages](http://packages.osrfoundation.org/gazebo)
Humble | Harmonic | [humble](https://github.com/gazebosim/ros_gz/tree/humble) | [gazebo packages](http://packages.osrfoundation.org/gazebo)

Forgot I don't have approval permissions 🤣 well, there's my mostly non-meaningful review/approval.

@azeey
Update readme
2dc282f 
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
@azeey
Copy link
Contributor Author

azeey commented Nov 15, 2023

Looks good, I would maybe suggest adding edits to the README.md though for harmonic as it's currently not listing Garden and hopefully soon Harmonic for Humble.

ROS 2 version Gazebo version Branch Binaries hosted at
Foxy Citadel foxy https://packages.ros.org
Foxy Edifice foxy only from source
Galactic Edifice galactic https://packages.ros.org
Galactic Fortress galactic only from source
Humble Fortress humble https://packages.ros.org
Humble Garden humble gazebo packages
Humble Harmonic humble gazebo packages
Rolling Edifice ros2 only from source
Rolling Fortress ros2 https://packages.ros.org
Rolling Garden ros2 only from source

I've updated the readme with two modifications from your suggestion:

@azeey azeey merged commit 514d53c into humble Nov 15, 2023
15 checks passed
@azeey azeey deleted the azeey/harmonic_humble branch November 15, 2023 17:09
Ayush1285 pushed a commit to Ayush1285/ros_gz that referenced this pull request Nov 17, 2023
@azeey @mjcarroll
@j-rivero @Ayush1285
Add support for Harmonic/Humble pairing (gazebosim#462)
70d1579 
* Add harmonic CI (gazebosim#447)

* Add harmonic CI

Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>

* Include garden options

Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>

* Add harmonic stanza

Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>

* Additional message headers

Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>

---------

Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>

* Use stable osrf repo for Garden and stable+prerelease for Harmonic (gazebosim#448)

Harmonic is now in the prerelease repository

Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>

* Add additional cmake/package.xml changes
* Update headers
* Update namespaces
* Add ci for harmonic/humble
* Update readme

---------

Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Co-authored-by: Michael Carroll <mjcarroll@intrinsic.ai>
Co-authored-by: Jose Luis Rivero <jrivero@osrfoundation.org>
Signed-off-by: Ayush1285 <ayush.singhftw@gmail.com>
@ejalaa12 ejalaa12 mentioned this pull request Jan 23, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ahcorde ahcorde ahcorde approved these changes

@j-rivero j-rivero j-rivero approved these changes

@bperseghetti bperseghetti bperseghetti approved these changes

@mjcarroll mjcarroll Awaiting requested review from mjcarroll

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@azeey @bperseghetti @ahcorde @j-rivero @mjcarroll