-
Notifications
You must be signed in to change notification settings - Fork 87
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
Renamed ign to gz (backport #67) #126
base: humble
Are you sure you want to change the base?
Conversation
Signed-off-by: Alejandro Hernández Cordero <[email protected]> (cherry picked from commit ab810e7) # Conflicts: # .github/workflows/ci.yaml # Dockerfile/Dockerfile # README.md # gz_ros2_control/src/gz_ros2_control_plugin.cpp # gz_ros2_control/src/gz_system.cpp # gz_ros2_control_demos/config/gripper_controller.yaml # gz_ros2_control_demos/examples/example_gripper.cpp # gz_ros2_control_demos/launch/cart_example_effort.launch.py # gz_ros2_control_demos/launch/cart_example_position.launch.py # gz_ros2_control_demos/launch/cart_example_velocity.launch.py # gz_ros2_control_demos/launch/diff_drive_example.launch.py # gz_ros2_control_demos/launch/gripper_mimic_joint_example.launch.py # gz_ros2_control_demos/launch/tricycle_drive_example.launch.py # gz_ros2_control_demos/package.xml # gz_ros2_control_demos/urdf/test_gripper_mimic_joint.xacro.urdf # ign_ros2_control/package.xml
@ahcorde @bmagyar I know that we released for humble, but he changes are backwards compatible. Expect someone is directly extending internal classes, which I don't think is the case yet. We had only one recent release to humble. I would love to merge this because it would reduce a huge load or maintenance for the next year or two. |
I agree it'd be better to backport the renaming but |
Just wanted to bump this, it would be great to get a gz release for humble to help us tame the naming fun we're in the middle of! |
Just expressing interest in this being backported. Regarding @bmagyar suggestion on having a proxy package to not break existing setups... I might be wrong, but as long as the old ros-humble-ign-ros2-control package is not removed from the debian repository existing setups should be fine (although in my opinion existing setups should migrate to the new naming convention). |
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.
<<<<<<< HEAD
There are 19 of these
|
||
<<<<<<< HEAD |
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.
Artifact of a bad merge/rebase.
:---------: | :----: | :----------: | | ||
[![Licence](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) | [![Build Status](http://build.ros2.org/buildStatus/icon?job=Hdev__ign_ros2_control__ubuntu_focal_amd64)](http://build.ros2.org/job/Hdev__ign_ros2_control__ubuntu_focal_amd64) | [![Build Status](http://build.ros2.org/buildStatus/icon?job=Hbin_uF64__ign_ros2_control__ubuntu_focal_amd64__binary)](http://build.ros2.org/job/Hbin_uF64__ign_ros2_control__ubuntu_focal_amd64__binary) | | ||
|
||
>>>>>>> ab810e7 (Renamed ign to gz (#67)) |
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.
artifact of bad merge/rebase
@@ -1,7 +1,12 @@ | |||
FROM ubuntu:20.04 | |||
|
|||
ENV DEBIAN_FRONTEND noninteractive | |||
<<<<<<< HEAD |
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.
bad merge artifact
======= | ||
ENV GZ_VERSION fortress | ||
ENV ROS_DISTRO rolling | ||
>>>>>>> ab810e7 (Renamed ign to gz (#67)) |
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.
bad merge artifact
@@ -118,56 +124,100 @@ include: | |||
</ros2_control> | |||
``` | |||
|
|||
<<<<<<< HEAD |
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.
There are bunch of these.
@moriarty I think the real question is how we should deal with the renaming, e.g. release two packages, or just don't update the ign* any more? |
I would avoid releasing 2. Personally I'd drop the ign, it might break somethings downstream but it won't break anything in production it will break some CI jobs, and the error msg will be quick to search and come across this thread or some other post. But the better thing do to would be to look how upstream ros_gz handle this, IIRC they released a shim package that pointed at the new renamed version but emitted a warning? |
You are right: https://github.com/gazebosim/ros_gz/pull/281/files That would be a relatively easy change here, @moriarty do you have time to work on this? (and open a new PR) |
This is an automatic backport of pull request #67 done by Mergify.
Cherry-pick of ab810e7 has failed:
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
Mergify commands and options
More conditions and actions can be found in the documentation.
You can also trigger Mergify actions by commenting on this pull request:
@Mergifyio refresh
will re-evaluate the rules@Mergifyio rebase
will rebase this PR on its base branch@Mergifyio update
will merge the base branch into this PR@Mergifyio backport <destination>
will backport this PR on<destination>
branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com