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

Garden EOL (backport #662) #667

Closed
wants to merge 1 commit into from
Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 11, 2024

Part of gazebo-tooling/release-tools#1165.

Since it will be possible to install Garden packages after EOL, I simply added footnotes on the rows that have EOLs. I also removed Garden from one of the suggested releases to install.


This is an automatic backport of pull request #662 done by [Mergify](https://mergify.com).

Signed-off-by: Addisu Z. Taddese <[email protected]>
(cherry picked from commit 63b651a)

# Conflicts:
#	.github/CODEOWNERS
#	.github/workflows/build-and-test.sh
#	.github/workflows/ros2-ci.yml
#	.github/workflows/triage.yml
#	README.md
#	README_RENAME.md
#	ros_gz/CHANGELOG.rst
#	ros_gz/package.xml
#	ros_gz_bridge/CHANGELOG.rst
#	ros_gz_bridge/CMakeLists.txt
#	ros_gz_bridge/README.md
#	ros_gz_bridge/bin/ros_gz_bridge_markdown_table
#	ros_gz_bridge/include/ros_gz_bridge/convert/geometry_msgs.hpp
#	ros_gz_bridge/include/ros_gz_bridge/convert/rcl_interfaces.hpp
#	ros_gz_bridge/include/ros_gz_bridge/convert/ros_gz_interfaces.hpp
#	ros_gz_bridge/include/ros_gz_bridge/convert/rosgraph_msgs.hpp
#	ros_gz_bridge/include/ros_gz_bridge/ros_gz_bridge.hpp
#	ros_gz_bridge/package.xml
#	ros_gz_bridge/resource/pkg_factories.cpp.em
#	ros_gz_bridge/ros_gz_bridge/__init__.py
#	ros_gz_bridge/ros_gz_bridge/mappings.py
#	ros_gz_bridge/src/bridge_config.cpp
#	ros_gz_bridge/src/bridge_handle.cpp
#	ros_gz_bridge/src/bridge_handle.hpp
#	ros_gz_bridge/src/bridge_handle_gz_to_ros.cpp
#	ros_gz_bridge/src/convert/actuator_msgs.cpp
#	ros_gz_bridge/src/convert/geometry_msgs.cpp
#	ros_gz_bridge/src/convert/gps_msgs.cpp
#	ros_gz_bridge/src/convert/ros_gz_interfaces.cpp
#	ros_gz_bridge/src/convert/sensor_msgs.cpp
#	ros_gz_bridge/src/factory.hpp
#	ros_gz_bridge/src/factory_interface.hpp
#	ros_gz_bridge/src/parameter_bridge.cpp
#	ros_gz_bridge/src/ros_gz_bridge.cpp
#	ros_gz_bridge/src/service_factories/ros_gz_interfaces.cpp
#	ros_gz_bridge/src/service_factory.hpp
#	ros_gz_bridge/src/static_bridge.cpp
#	ros_gz_bridge/test/bridge_config.cpp
#	ros_gz_bridge/test/resource/gz_publisher.cpp.em
#	ros_gz_bridge/test/resource/gz_subscriber.cpp.em
#	ros_gz_bridge/test/utils/gz_test_msg.cpp
#	ros_gz_bridge/test/utils/gz_test_msg.hpp
#	ros_gz_bridge/test/utils/ros_test_msg.cpp
#	ros_gz_bridge/test/utils/ros_test_msg.hpp
#	ros_gz_image/CHANGELOG.rst
#	ros_gz_image/CMakeLists.txt
#	ros_gz_image/README.md
#	ros_gz_image/package.xml
#	ros_gz_image/src/image_bridge.cpp
#	ros_gz_interfaces/CHANGELOG.rst
#	ros_gz_interfaces/package.xml
#	ros_gz_point_cloud/examples/depth_camera.sdf
#	ros_gz_point_cloud/examples/gpu_lidar.sdf
#	ros_gz_point_cloud/examples/rgbd_camera.sdf
#	ros_gz_point_cloud/package.xml
#	ros_gz_sim/CHANGELOG.rst
#	ros_gz_sim/CMakeLists.txt
#	ros_gz_sim/README.md
#	ros_gz_sim/launch/gz_sim.launch.py.in
#	ros_gz_sim/package.xml
#	ros_gz_sim/src/create.cpp
#	ros_gz_sim_demos/CHANGELOG.rst
#	ros_gz_sim_demos/launch/joint_states.launch.py
#	ros_gz_sim_demos/launch/robot_description_publisher.launch.py
#	ros_gz_sim_demos/launch/tf_bridge.launch.py
#	ros_gz_sim_demos/package.xml
#	test_ros_gz_bridge/package.xml
@mergify mergify bot added the conflicts label Dec 11, 2024
Copy link
Contributor Author

mergify bot commented Dec 11, 2024

Cherry-pick of 63b651a has failed:

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

You are currently cherry-picking commit 63b651a.
  (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:
	new file:   img/video_img.png
	new file:   ros_gz_bridge/launch/ros_gz_bridge.launch
	new file:   ros_gz_bridge/launch/ros_gz_bridge.launch.py
	new file:   ros_gz_bridge/resource/ros_gz_bridge
	new file:   ros_gz_bridge/ros_gz_bridge/actions/__init__.py
	new file:   ros_gz_bridge/ros_gz_bridge/actions/ros_gz_bridge.py
	new file:   ros_gz_bridge/setup.cfg
	new file:   ros_gz_bridge/test/config/empty.yaml
	new file:   ros_gz_bridge/test/config/invalid.yaml
	new file:   ros_gz_sim/launch/gz_remove_model.launch.py
	new file:   ros_gz_sim/launch/gz_server.launch
	new file:   ros_gz_sim/launch/gz_server.launch.py
	new file:   ros_gz_sim/launch/gz_spawn_model.launch
	new file:   ros_gz_sim/launch/gz_spawn_model.launch.py
	new file:   ros_gz_sim/launch/ros_gz_sim.launch
	new file:   ros_gz_sim/launch/ros_gz_sim.launch.py
	new file:   ros_gz_sim/launch/ros_gz_spawn_model.launch
	new file:   ros_gz_sim/launch/ros_gz_spawn_model.launch.py
	new file:   ros_gz_sim/resource/ros_gz_sim
	new file:   ros_gz_sim/ros_gz_sim/__init__.py
	new file:   ros_gz_sim/ros_gz_sim/actions/__init__.py
	new file:   ros_gz_sim/ros_gz_sim/actions/gz_spawn_model.py
	new file:   ros_gz_sim/ros_gz_sim/actions/gzserver.py
	new file:   ros_gz_sim/setup.cfg
	new file:   ros_gz_sim/src/gzserver.cpp
	new file:   ros_gz_sim/src/remove.cpp
	new file:   ros_gz_sim/test/test_create.cpp
	new file:   ros_gz_sim/test/test_create_node.launch.py
	new file:   ros_gz_sim/test/test_remove.cpp
	new file:   ros_gz_sim/test/test_remove_node.launch.py
	new file:   test_ros_gz_bridge/CHANGELOG.rst

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both added:      .github/CODEOWNERS
	both added:      .github/workflows/build-and-test.sh
	both added:      .github/workflows/ros2-ci.yml
	both added:      .github/workflows/triage.yml
	both added:      README.md
	both added:      README_RENAME.md
	both added:      ros_gz/CHANGELOG.rst
	both added:      ros_gz/package.xml
	both added:      ros_gz_bridge/CHANGELOG.rst
	both added:      ros_gz_bridge/CMakeLists.txt
	both added:      ros_gz_bridge/README.md
	both added:      ros_gz_bridge/bin/ros_gz_bridge_markdown_table
	both added:      ros_gz_bridge/include/ros_gz_bridge/convert/geometry_msgs.hpp
	both added:      ros_gz_bridge/include/ros_gz_bridge/convert/rcl_interfaces.hpp
	both added:      ros_gz_bridge/include/ros_gz_bridge/convert/ros_gz_interfaces.hpp
	both added:      ros_gz_bridge/include/ros_gz_bridge/convert/rosgraph_msgs.hpp
	both added:      ros_gz_bridge/include/ros_gz_bridge/ros_gz_bridge.hpp
	both added:      ros_gz_bridge/package.xml
	both added:      ros_gz_bridge/resource/pkg_factories.cpp.em
	both added:      ros_gz_bridge/ros_gz_bridge/__init__.py
	both added:      ros_gz_bridge/ros_gz_bridge/mappings.py
	both added:      ros_gz_bridge/src/bridge_config.cpp
	both added:      ros_gz_bridge/src/bridge_handle.cpp
	both added:      ros_gz_bridge/src/bridge_handle.hpp
	both added:      ros_gz_bridge/src/bridge_handle_gz_to_ros.cpp
	both added:      ros_gz_bridge/src/convert/actuator_msgs.cpp
	both added:      ros_gz_bridge/src/convert/geometry_msgs.cpp
	both added:      ros_gz_bridge/src/convert/gps_msgs.cpp
	both added:      ros_gz_bridge/src/convert/ros_gz_interfaces.cpp
	both added:      ros_gz_bridge/src/convert/sensor_msgs.cpp
	both added:      ros_gz_bridge/src/factory.hpp
	both added:      ros_gz_bridge/src/factory_interface.hpp
	both added:      ros_gz_bridge/src/parameter_bridge.cpp
	both added:      ros_gz_bridge/src/ros_gz_bridge.cpp
	both added:      ros_gz_bridge/src/service_factories/ros_gz_interfaces.cpp
	both added:      ros_gz_bridge/src/service_factory.hpp
	both added:      ros_gz_bridge/src/static_bridge.cpp
	both added:      ros_gz_bridge/test/bridge_config.cpp
	both added:      ros_gz_bridge/test/resource/gz_publisher.cpp.em
	both added:      ros_gz_bridge/test/resource/gz_subscriber.cpp.em
	both added:      ros_gz_bridge/test/utils/gz_test_msg.cpp
	both added:      ros_gz_bridge/test/utils/gz_test_msg.hpp
	both added:      ros_gz_bridge/test/utils/ros_test_msg.cpp
	both added:      ros_gz_bridge/test/utils/ros_test_msg.hpp
	both added:      ros_gz_image/CHANGELOG.rst
	both added:      ros_gz_image/CMakeLists.txt
	both added:      ros_gz_image/README.md
	both added:      ros_gz_image/package.xml
	both added:      ros_gz_image/src/image_bridge.cpp
	both added:      ros_gz_interfaces/CHANGELOG.rst
	both added:      ros_gz_interfaces/package.xml
	both added:      ros_gz_point_cloud/examples/depth_camera.sdf
	both added:      ros_gz_point_cloud/examples/gpu_lidar.sdf
	both added:      ros_gz_point_cloud/examples/rgbd_camera.sdf
	both added:      ros_gz_point_cloud/package.xml
	both added:      ros_gz_sim/CHANGELOG.rst
	both added:      ros_gz_sim/CMakeLists.txt
	both added:      ros_gz_sim/README.md
	both added:      ros_gz_sim/launch/gz_sim.launch.py.in
	both added:      ros_gz_sim/package.xml
	both added:      ros_gz_sim/src/create.cpp
	both added:      ros_gz_sim_demos/CHANGELOG.rst
	both added:      ros_gz_sim_demos/launch/joint_states.launch.py
	both added:      ros_gz_sim_demos/launch/robot_description_publisher.launch.py
	both added:      ros_gz_sim_demos/launch/tf_bridge.launch.py
	both added:      ros_gz_sim_demos/package.xml
	both added:      test_ros_gz_bridge/package.xml

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

@mergify mergify bot mentioned this pull request Dec 11, 2024
@ahcorde ahcorde closed this Dec 11, 2024
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.

2 participants