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

Extract robot description into global package (again) (backport #339) #346

Merged
merged 1 commit into from
Aug 17, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 17, 2023

This is an automatic backport of pull request #339 done by Mergify.
Cherry-pick of 83b8f91 has failed:

On branch mergify/bp/humble/pr-339
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit 83b8f91.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   example_1/CMakeLists.txt
	modified:   example_1/bringup/launch/rrbot.launch.py
	modified:   example_1/description/launch/view_robot.launch.py
	modified:   example_1/description/urdf/rrbot.urdf.xacro
	deleted:    example_1/description/urdf/rrbot_description.urdf.xacro
	modified:   example_1/doc/userdoc.rst
	modified:   example_12/CMakeLists.txt
	modified:   example_12/bringup/launch/rrbot.launch.py
	modified:   example_12/description/launch/view_robot.launch.py
	deleted:    example_12/description/rviz/rrbot.rviz
	deleted:    example_12/description/urdf/rrbot.materials.xacro
	modified:   example_12/description/urdf/rrbot.urdf.xacro
	deleted:    example_12/description/urdf/rrbot_description.urdf.xacro
	modified:   example_12/doc/userdoc.rst
	modified:   example_2/CMakeLists.txt
	modified:   example_2/bringup/launch/diffbot.launch.py
	modified:   example_2/description/launch/view_robot.launch.py
	modified:   example_2/description/urdf/diffbot.urdf.xacro
	modified:   example_2/doc/userdoc.rst
	modified:   example_3/CMakeLists.txt
	modified:   example_3/bringup/launch/rrbot_system_multi_interface.launch.py
	modified:   example_3/description/launch/view_robot.launch.py
	deleted:    example_3/description/rviz/rrbot.rviz
	deleted:    example_3/description/urdf/rrbot.materials.xacro
	deleted:    example_3/description/urdf/rrbot_description.urdf.xacro
	modified:   example_3/description/urdf/rrbot_system_multi_interface.urdf.xacro
	modified:   example_3/doc/userdoc.rst
	deleted:    example_4/description/urdf/rrbot.materials.xacro
	deleted:    example_4/description/urdf/rrbot_description.urdf.xacro
	modified:   example_4/description/urdf/rrbot_system_with_sensor.urdf.xacro
	modified:   example_4/doc/userdoc.rst
	deleted:    example_5/description/urdf/rrbot.materials.xacro
	deleted:    example_5/description/urdf/rrbot_description.urdf.xacro
	modified:   example_5/description/urdf/rrbot_system_with_external_sensor.urdf.xacro
	modified:   example_5/doc/userdoc.rst
	modified:   example_6/CMakeLists.txt
	modified:   example_6/bringup/launch/rrbot_modular_actuators.launch.py
	modified:   example_6/description/launch/view_robot.launch.py
	deleted:    example_6/description/rviz/rrbot.rviz
	deleted:    example_6/description/urdf/rrbot.materials.xacro
	deleted:    example_6/description/urdf/rrbot_description.urdf.xacro
	modified:   example_6/description/urdf/rrbot_modular_actuators.urdf.xacro
	modified:   example_6/doc/userdoc.rst
	modified:   example_7/CMakeLists.txt
	modified:   example_7/bringup/launch/r6bot_controller.launch.py
	modified:   example_7/description/launch/view_r6bot.launch.py
	modified:   example_7/description/urdf/r6bot.urdf.xacro
	modified:   example_7/package.xml
	modified:   example_8/CMakeLists.txt
	modified:   example_8/bringup/launch/rrbot_transmissions_system_position_only.launch.py
	modified:   example_8/description/launch/view_robot.launch.py
	deleted:    example_8/description/rviz/rrbot.rviz
	deleted:    example_8/description/urdf/rrbot.materials.xacro
	deleted:    example_8/description/urdf/rrbot_description.urdf.xacro
	modified:   example_8/description/urdf/rrbot_transmissions_system_position_only.urdf.xacro
	modified:   example_8/doc/userdoc.rst
	modified:   example_9/CMakeLists.txt
	modified:   example_9/bringup/launch/rrbot.launch.py
	modified:   example_9/bringup/launch/rrbot_gazebo_classic.launch.py
	modified:   example_9/description/launch/view_robot.launch.py
	deleted:    example_9/description/rviz/rrbot.rviz
	deleted:    example_9/description/urdf/rrbot.materials.xacro
	modified:   example_9/description/urdf/rrbot.urdf.xacro
	deleted:    example_9/description/urdf/rrbot_description.urdf.xacro
	modified:   example_9/doc/userdoc.rst
	modified:   example_9/package.xml
	new file:   ros2_control_demo_description/CMakeLists.txt
	renamed:    example_2/description/rviz/diffbot.rviz -> ros2_control_demo_description/diffbot/rviz/diffbot.rviz
	renamed:    example_2/description/rviz/diffbot_view.rviz -> ros2_control_demo_description/diffbot/rviz/diffbot_view.rviz
	renamed:    example_2/description/urdf/diffbot.materials.xacro -> ros2_control_demo_description/diffbot/urdf/diffbot.materials.xacro
	renamed:    example_2/description/urdf/diffbot_description.urdf.xacro -> ros2_control_demo_description/diffbot/urdf/diffbot_description.urdf.xacro
	new file:   ros2_control_demo_description/package.xml
	renamed:    example_7/description/meshes/collision/link_0.stl -> ros2_control_demo_description/r6bot/meshes/collision/link_0.stl
	renamed:    example_7/description/meshes/collision/link_1.stl -> ros2_control_demo_description/r6bot/meshes/collision/link_1.stl
	renamed:    example_7/description/meshes/collision/link_2.stl -> ros2_control_demo_description/r6bot/meshes/collision/link_2.stl
	renamed:    example_7/description/meshes/collision/link_3.stl -> ros2_control_demo_description/r6bot/meshes/collision/link_3.stl
	renamed:    example_7/description/meshes/collision/link_4.stl -> ros2_control_demo_description/r6bot/meshes/collision/link_4.stl
	renamed:    example_7/description/meshes/collision/link_5.stl -> ros2_control_demo_description/r6bot/meshes/collision/link_5.stl
	renamed:    example_7/description/meshes/collision/link_6.stl -> ros2_control_demo_description/r6bot/meshes/collision/link_6.stl
	renamed:    example_7/description/meshes/visual/link_0.dae -> ros2_control_demo_description/r6bot/meshes/visual/link_0.dae
	renamed:    example_7/description/meshes/visual/link_1.dae -> ros2_control_demo_description/r6bot/meshes/visual/link_1.dae
	renamed:    example_7/description/meshes/visual/link_2.dae -> ros2_control_demo_description/r6bot/meshes/visual/link_2.dae
	renamed:    example_7/description/meshes/visual/link_3.dae -> ros2_control_demo_description/r6bot/meshes/visual/link_3.dae
	renamed:    example_7/description/meshes/visual/link_4.dae -> ros2_control_demo_description/r6bot/meshes/visual/link_4.dae
	renamed:    example_7/description/meshes/visual/link_5.dae -> ros2_control_demo_description/r6bot/meshes/visual/link_5.dae
	renamed:    example_7/description/meshes/visual/link_6.dae -> ros2_control_demo_description/r6bot/meshes/visual/link_6.dae
	renamed:    example_7/description/rviz/view_robot.rviz -> ros2_control_demo_description/r6bot/rviz/view_robot.rviz
	renamed:    example_7/description/srdf/r6bot.srdf -> ros2_control_demo_description/r6bot/srdf/r6bot.srdf
	renamed:    example_7/description/urdf/inc/create_link.xacro -> ros2_control_demo_description/r6bot/urdf/inc/create_link.xacro
	new file:   ros2_control_demo_description/r6bot/urdf/r6bot_description.urdf.xacro
	renamed:    example_1/description/rviz/rrbot.rviz -> ros2_control_demo_description/rrbot/rviz/rrbot.rviz
	renamed:    example_1/description/urdf/rrbot.materials.xacro -> ros2_control_demo_description/rrbot/urdf/rrbot.materials.xacro
	new file:   ros2_control_demo_description/rrbot/urdf/rrbot_description.urdf.xacro

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   example_1/package.xml
	both modified:   example_2/package.xml
	both modified:   example_3/package.xml
	both modified:   example_4/package.xml
	both modified:   example_5/package.xml
	both modified:   example_6/package.xml
	both modified:   example_8/package.xml

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> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@christophfroehlich
Copy link
Contributor

Merge conflicts because #305 and #310 weren't backported yet, waiting for ros-controls/ros2_control#1052 being released

@christophfroehlich christophfroehlich deleted the mergify/bp/humble/pr-339 branch August 17, 2023 06:52
@christophfroehlich christophfroehlich restored the mergify/bp/humble/pr-339 branch August 17, 2023 08:40
* Use global rrbot_description in all examples
* Move diffbot description to description package
* Move r6bot into description package
@christophfroehlich
Copy link
Contributor

I made a manual backport now.

@christophfroehlich christophfroehlich merged commit 66c2c23 into humble Aug 17, 2023
12 checks passed
@mergify mergify bot deleted the mergify/bp/humble/pr-339 branch August 17, 2023 08:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant