gazebosim · mergify · Dec 6, 2024
@@ -12,7 +12,11 @@ jobs:
         include:
           - docker-image: "ubuntu:24.04"
             gz-version: "harmonic"
+<<<<<<< HEAD
             ros-distro: "jazzy"
+=======
+            ros-distro: "rolling"
+>>>>>>> 63b651a (Garden EOL (#662))
     container:
       image: ${{ matrix.docker-image }}
     steps:

@@ -3,6 +3,7 @@
 ROS 2 version | Gazebo version | Branch | Binaries hosted at
 -- | -- | -- | --
 Foxy | Citadel | [foxy](https://github.com/gazebosim/ros_gz/tree/foxy) | https://packages.ros.org
+<<<<<<< HEAD
 Foxy | Edifice | [foxy](https://github.com/gazebosim/ros_gz/tree/foxy) | only from source
 Galactic | Edifice | [galactic](https://github.com/gazebosim/ros_gz/tree/galactic) | https://packages.ros.org
 Galactic | Fortress | [galactic](https://github.com/gazebosim/ros_gz/tree/galactic) | only from source
@@ -24,6 +25,28 @@ For information on ROS(1) and Gazebo compatibility, refer to the [noetic branch
 
 > Please [ticket an issue](https://github.com/gazebosim/ros_gz/issues/) if you'd like support to be added for some combination.
 
+=======
+Foxy | Edifice | [foxy](https://github.com/gazebosim/ros_gz/tree/foxy) | only from source [^2]
+Galactic | Edifice | [galactic](https://github.com/gazebosim/ros_gz/tree/galactic) | https://packages.ros.org [^2]
+Galactic | Fortress | [galactic](https://github.com/gazebosim/ros_gz/tree/galactic) | only from source
+Humble | Fortress | [humble](https://github.com/gazebosim/ros_gz/tree/humble) | https://packages.ros.org
+Humble | Garden | [humble](https://github.com/gazebosim/ros_gz/tree/humble) | [gazebo packages](https://gazebosim.org/docs/latest/ros_installation#gazebo-garden-with-ros-2-humble-iron-or-rolling-use-with-caution-)[^1] [^2]
+Humble | Harmonic | [humble](https://github.com/gazebosim/ros_gz/tree/humble) | [gazebo packages](https://gazebosim.org/docs/harmonic/ros_installation#-gazebo-harmonic-with-ros-2-humble-iron-or-rolling-use-with-caution-)[^1]
+Iron | Fortress | [humble](https://github.com/gazebosim/ros_gz/tree/iron) | https://packages.ros.org
+Iron | Garden | [humble](https://github.com/gazebosim/ros_gz/tree/iron) | only from source [^2]
+Iron | Harmonic | [humble](https://github.com/gazebosim/ros_gz/tree/iron) | only from source
+Jazzy | Garden | [ros2](https://github.com/gazebosim/ros_gz/tree/ros2) | only from source [^2]
+Jazzy | Harmonic | [jazzy](https://github.com/gazebosim/ros_gz/tree/jazzy) | https://packages.ros.org
+Rolling | Fortress | [humble](https://github.com/gazebosim/ros_gz/tree/humble) | https://packages.ros.org
+Rolling | Garden | [ros2](https://github.com/gazebosim/ros_gz/tree/ros2) | only from source [^2]
+Rolling | Harmonic | [ros2](https://github.com/gazebosim/ros_gz/tree/ros2) | only from source
+
+[^1]: Binaries for these pairings are provided from the packages.osrfoundation.org repository. Refer to https://gazebosim.org/docs/latest/ros_installation for installation instructions.
+[^2]: Note that the Gazebo version on this row has reached end-of-life.
+
+For information on ROS(1) and Gazebo compatibility, refer to the [noetic branch README](https://github.com/gazebosim/ros_gz/tree/noetic)
+
+>>>>>>> 63b651a (Garden EOL (#662))
 [Details about the renaming process](README_RENAME.md) from `ign` to `gz` .
 
 **Note**: The `ros_ign` prefixed packages are shim packages that redirect to their `ros_gz` counterpart.
@@ -59,7 +82,11 @@ This repository holds packages that provide integration between
 
 ## Install
 
+<<<<<<< HEAD
 This branch supports ROS Jazzy. See above for other ROS versions.
+=======
+This branch supports ROS Rolling. See above for other ROS versions.
+>>>>>>> 63b651a (Garden EOL (#662))
 
 ### Binaries
 
@@ -74,19 +101,31 @@ They are hosted at https://packages.ros.org.
 
 1. Install `ros_gz`
 
+<<<<<<< HEAD
         sudo apt install ros-jazzy-ros-gz
+=======
+        sudo apt install ros-rolling-ros-gz
+>>>>>>> 63b651a (Garden EOL (#662))
 
 ### From source
 
 #### ROS
 
 Be sure you've installed
+<<<<<<< HEAD
 [ROS Jazzy](https://docs.ros.org/en/jazzy/Installation.html)
+=======
+[ROS Rolling](https://docs.ros.org/en/rolling/index.html)
+>>>>>>> 63b651a (Garden EOL (#662))
 (at least ROS-Base). More ROS dependencies will be installed below.
 
 #### Gazebo
 
+<<<<<<< HEAD
 Install either [Garden or Harmonic](https://gazebosim.org/docs).
+=======
+Install either [Fortress, Harmonic or Ionic](https://gazebosim.org/docs).
+>>>>>>> 63b651a (Garden EOL (#662))
 
 Set the `GZ_VERSION` environment variable to the Gazebo version you'd
 like to compile against. For example:
@@ -97,7 +136,11 @@ like to compile against. For example:
 
 #### Compile ros_gz
 
+<<<<<<< HEAD
 The following steps are for Linux and OSX.
+=======
+The following steps are for Linux and macOS.
+>>>>>>> 63b651a (Garden EOL (#662))
 
 1. Create a colcon workspace:
 
@@ -107,14 +150,22 @@ The following steps are for Linux and OSX.
     cd ~/ws/src
 
     # Download needed software
+<<<<<<< HEAD
     git clone https://github.com/gazebosim/ros_gz.git -b jazzy
+=======
+    git clone https://github.com/gazebosim/ros_gz.git -b ros2
+>>>>>>> 63b651a (Garden EOL (#662))
     ```
 
 1. Install dependencies (this may also install Gazebo):
 
     ```
     cd ~/ws
+<<<<<<< HEAD
     rosdep install -r --from-paths src -i -y --rosdistro jazzy
+=======
+    rosdep install -r --from-paths src -i -y --rosdistro rolling
+>>>>>>> 63b651a (Garden EOL (#662))
     ```
 
     > If `rosdep` fails to install Gazebo libraries and you have not installed them before, please follow [Gazebo installation instructions](https://gazebosim.org/docs/latest/install).

@@ -2,6 +2,7 @@
 Changelog for package ros_gz
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+<<<<<<< HEAD
 1.0.7 (2024-11-08)
 ------------------
 
@@ -18,6 +19,24 @@ Changelog for package ros_gz
 ------------------
 
 1.0.2 (2024-07-03)
+=======
+2.1.2 (2024-10-31)
+------------------
+
+2.1.1 (2024-10-14)
+------------------
+
+2.1.0 (2024-09-12)
+------------------
+
+2.0.1 (2024-08-29)
+------------------
+
+2.0.0 (2024-07-22)
+------------------
+
+1.0.1 (2024-07-03)
+>>>>>>> 63b651a (Garden EOL (#662))
 ------------------
 * Prepare for 1.0.0 Release (`#495 <https://github.com/gazebosim/ros_gz//issues/495>`_)
 * 0.244.14

@@ -4,7 +4,11 @@
   <!-- TODO: Make this a metapackage, see
        https://github.com/ros2/ros2/issues/408 -->
   <name>ros_gz</name>
+<<<<<<< HEAD
   <version>1.0.7</version>
+=======
+  <version>2.1.2</version>
+>>>>>>> 63b651a (Garden EOL (#662))
   <description>Meta-package containing interfaces for using ROS 2 with <a href="https://gazebosim.org">Gazebo</a> simulation.</description>
   <maintainer email="[email protected]">Aditya Pande</maintainer>
   <maintainer email="[email protected]">Alejandro Hernandez</maintainer>

@@ -2,6 +2,7 @@
 Changelog for package ros_gz_bridge
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+<<<<<<< HEAD
 1.0.7 (2024-11-08)
 ------------------
 
@@ -50,6 +51,48 @@ Changelog for package ros_gz_bridge
 
 1.0.2 (2024-07-03)
 ------------------
+=======
+2.1.2 (2024-10-31)
+------------------
+
+2.1.1 (2024-10-14)
+------------------
+* Extra parameter to start a container (`#616 <https://github.com/gazebosim/ros_gz/issues/616>`_)
+* adds deadline and liveliness QoSPolicyKinds to qos_overriding_options (`#609 <https://github.com/gazebosim/ros_gz/issues/609>`_)
+  Co-authored-by: nora <[email protected]>
+* Contributors: Carlos Agüero, norakon
+
+2.1.0 (2024-09-12)
+------------------
+* Remove default_value for required arguments (`#602 <https://github.com/gazebosim/ros_gz//issues/602>`_)
+  * Remove default_value for config_file
+* Fix errors with name of bridge not being given (`#600 <https://github.com/gazebosim/ros_gz//issues/600>`_)
+  * Add argument bridge_name to fix errors
+* Use optional parameters in actions (`#601 <https://github.com/gazebosim/ros_gz//issues/601>`_)
+* Contributors: Amronos, Carlos Agüero
+
+2.0.1 (2024-08-29)
+------------------
+* Stamp all outgoing headers with the wall time if parameter override_timestamps_with_wall_time is set to true (`#562 <https://github.com/gazebosim/ros_gz/issues/562>`_)
+* Contributors: Rein Appeldoorn
+
+2.0.0 (2024-07-22)
+------------------
+* Making use_composition true by default (`#578 <https://github.com/gazebosim/ros_gz/issues/578>`_)
+* Contributors: Addisu Z. Taddese
+
+1.0.1 (2024-07-03)
+------------------
+* Add support for gz.msgs.EntityWrench (base branch: ros2) (`#573 <https://github.com/gazebosim/ros_gz//issues/573>`_)
+* Merge pull request `#571 <https://github.com/gazebosim/ros_gz//issues/571>`_ from azeey/jazzy_to_ros2
+  Merge jazzy ➡️  ros2
+* Merge branch 'ros2' into jazzy_to_ros2
+* Use memcpy instead of std::copy when bridging images (`#565 <https://github.com/gazebosim/ros_gz//issues/565>`_)
+  While testing ros <-> gz communication using the bridge I noticed that the bridge was talking quite a bit of time copying images from Gazebo to ROS. I found that the std::copy operation that we're doing is substantially slower than the memcpy alternative. I think that in principle this shouldn't happen but the numbers are quite clear. Perhaps std::copy is doing something that doesn't use cache effectively
+  ---------
+  Co-authored-by: Jose Luis Rivero <[email protected]>
+* Merge jazzy into ros2
+>>>>>>> 63b651a (Garden EOL (#662))
 * Merge pull request `#569 <https://github.com/gazebosim/ros_gz//issues/569>`_ from azeey/iron_to_jazzy
   Merge iron ➡️  jazzy
 * Merge iron into jazzy
@@ -62,6 +105,25 @@ Changelog for package ros_gz_bridge
 * Merge pull request `#564 <https://github.com/gazebosim/ros_gz//issues/564>`_ from azeey/humble_to_iron
   Humble ➡️ Iron
 * Merge humble -> iron
+<<<<<<< HEAD
+=======
+* Use `ignoreLocalMessages` in the bridge (`#559 <https://github.com/gazebosim/ros_gz//issues/559>`_)
+  * Ignore local messages
+* Update launch files with name parameter (`#556 <https://github.com/gazebosim/ros_gz//issues/556>`_)
+  * Name is required.
+* Ensure the same container is used for the bridge and gz_server (`#553 <https://github.com/gazebosim/ros_gz//issues/553>`_)
+  This also adds a required `name` parameter for the bridge so that
+  multiple different bridges can be created without name collision
+* Launch ros_gz_bridge from xml (`#550 <https://github.com/gazebosim/ros_gz//issues/550>`_)
+  * Add gzserver with ability to load an SDF file or string
+* Launch gzserver and the bridge as composable nodes (`#528 <https://github.com/gazebosim/ros_gz//issues/528>`_)
+  * Add gzserver with ability to load an SDF file or string
+* Add option to change material color from ROS. (`#521 <https://github.com/gazebosim/ros_gz//issues/521>`_)
+  Forward port of `#486 <https://github.com/gazebosim/ros_gz//issues/486>`_.
+  * Message and bridge for MaterialColor.
+  This allows bridging MaterialColor from ROS to GZ and is
+  important for allowing simulation users to create status lights.
+>>>>>>> 63b651a (Garden EOL (#662))
 * populate imu covariances when converting (`#375 <https://github.com/gazebosim/ros_gz//issues/375>`_) (`#540 <https://github.com/gazebosim/ros_gz//issues/540>`_)
   Co-authored-by: El Jawad Alaa <[email protected]>
 * Prepare for 1.0.0 Release (`#495 <https://github.com/gazebosim/ros_gz//issues/495>`_)
@@ -151,7 +213,11 @@ Changelog for package ros_gz_bridge
   * Update CMakeLists and package.xml for garden
   * Complete garden gz renaming
   * Drop fortress CI
+<<<<<<< HEAD
 * Contributors: Addisu Z. Taddese, Aditya Pande, Alejandro Hernández Cordero, Arjun K Haridas, Benjamin Perseghetti, El Jawad Alaa, Jose Luis Rivero, Krzysztof Wojciechowski, Michael Carroll, Rousseau Vincent, Yadu, ahcorde, wittenator, ymd-stella
+=======
+* Contributors: Addisu Z. Taddese, Aditya Pande, Alejandro Hernández Cordero, Arjun K Haridas, Benjamin Perseghetti, Carlos Agüero, El Jawad Alaa, Jose Luis Rivero, Krzysztof Wojciechowski, Michael Carroll, Rousseau Vincent, Victor T. Noppeney, Yadu, ahcorde, wittenator, ymd-stella
+>>>>>>> 63b651a (Garden EOL (#662))
 
 1.0.0 (2024-04-24)
 ------------------

@@ -2,7 +2,11 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>ros_gz_bridge</name>
+<<<<<<< HEAD
   <version>1.0.7</version>
+=======
+  <version>2.1.2</version>
+>>>>>>> 63b651a (Garden EOL (#662))
   <description>Bridge communication between ROS and Gazebo Transport</description>
   <maintainer email="[email protected]">Aditya Pande</maintainer>
   <maintainer email="[email protected]">Alejandro Hernandez</maintainer>

@@ -2,6 +2,7 @@
 Changelog for package ros1_ign_image
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+<<<<<<< HEAD
 1.0.7 (2024-11-08)
 ------------------
 
@@ -19,6 +20,28 @@ Changelog for package ros1_ign_image
 
 1.0.2 (2024-07-03)
 ------------------
+=======
+2.1.2 (2024-10-31)
+------------------
+
+2.1.1 (2024-10-14)
+------------------
+
+2.1.0 (2024-09-12)
+------------------
+
+2.0.1 (2024-08-29)
+------------------
+
+2.0.0 (2024-07-22)
+------------------
+
+1.0.1 (2024-07-03)
+------------------
+* Merge pull request `#571 <https://github.com/gazebosim/ros_gz//issues/571>`_ from azeey/jazzy_to_ros2
+  Merge jazzy ➡️  ros2
+* Merge jazzy into ros2
+>>>>>>> 63b651a (Garden EOL (#662))
 * Merge pull request `#569 <https://github.com/gazebosim/ros_gz//issues/569>`_ from azeey/iron_to_jazzy
   Merge iron ➡️  jazzy
 * Merge iron into jazzy

@@ -1,6 +1,10 @@
 <package format="3">
   <name>ros_gz_image</name>
+<<<<<<< HEAD
   <version>1.0.7</version>
+=======
+  <version>2.1.2</version>
+>>>>>>> 63b651a (Garden EOL (#662))
   <description>Image utilities for Gazebo simulation with ROS.</description>
   <license>Apache 2.0</license>
   <maintainer email="[email protected]">Aditya Pande</maintainer>

@@ -2,6 +2,7 @@
 Changelog for package ros_gz_interfaces
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+<<<<<<< HEAD
 1.0.7 (2024-11-08)
 ------------------
 
@@ -23,12 +24,40 @@ Changelog for package ros_gz_interfaces
 
 1.0.2 (2024-07-03)
 ------------------
+=======
+2.1.2 (2024-10-31)
+------------------
+
+2.1.1 (2024-10-14)
+------------------
+
+2.1.0 (2024-09-12)
+------------------
+
+2.0.1 (2024-08-29)
+------------------
+
+2.0.0 (2024-07-22)
+------------------
+
+1.0.1 (2024-07-03)
+------------------
+* Add support for gz.msgs.EntityWrench (base branch: ros2) (`#573 <https://github.com/gazebosim/ros_gz//issues/573>`_)
+>>>>>>> 63b651a (Garden EOL (#662))
 * Add option to change material color from ROS. (`#521 <https://github.com/gazebosim/ros_gz//issues/521>`_)
   Forward port of `#486 <https://github.com/gazebosim/ros_gz//issues/486>`_.
   * Message and bridge for MaterialColor.
   This allows bridging MaterialColor from ROS to GZ and is
   important for allowing simulation users to create status lights.
   (cherry picked from commit 78dc4823121f085594e6028a93f1e571eb04f58b)
+<<<<<<< HEAD
+=======
+* Add option to change material color from ROS. (`#521 <https://github.com/gazebosim/ros_gz//issues/521>`_)
+  Forward port of `#486 <https://github.com/gazebosim/ros_gz//issues/486>`_.
+  * Message and bridge for MaterialColor.
+  This allows bridging MaterialColor from ROS to GZ and is
+  important for allowing simulation users to create status lights.
+>>>>>>> 63b651a (Garden EOL (#662))
 * Prepare for 1.0.0 Release (`#495 <https://github.com/gazebosim/ros_gz//issues/495>`_)
 * 0.244.14
 * Changelog
@@ -60,7 +89,11 @@ Changelog for package ros_gz_interfaces
 * humble to ros2 (`#311 <https://github.com/gazebosim/ros_gz//issues/311>`_)
   Co-authored-by: Michael Carroll <[email protected]>
 * Merge remote-tracking branch 'origin/humble' into ahcorde/humble_to_ros2
+<<<<<<< HEAD
 * Contributors: Addisu Z. Taddese, Aditya Pande, Alejandro Hernández Cordero, Benjamin Perseghetti, Jose Luis Rivero, Michael Carroll, ahcorde
+=======
+* Contributors: Addisu Z. Taddese, Aditya Pande, Alejandro Hernández Cordero, Benjamin Perseghetti, Jose Luis Rivero, Michael Carroll, Victor T. Noppeney, ahcorde
+>>>>>>> 63b651a (Garden EOL (#662))
 
 1.0.0 (2024-04-24)
 ------------------

@@ -1,6 +1,10 @@
 <package format="3">
   <name>ros_gz_interfaces</name>
+<<<<<<< HEAD
   <version>1.0.7</version>
+=======
+  <version>2.1.2</version>
+>>>>>>> 63b651a (Garden EOL (#662))
   <description>Message and service data structures for interacting with Gazebo from ROS2.</description>
   <license>Apache 2.0</license>
   <author>Louise Poubel</author>