Fix 'microxrcedds_agent' name and dependency (#279)

* Fix 'microxrcedds_agent' name and dependency

Signed-off-by: David Laseca Perez <davidlaseca@eprosima.com>

* Set tag of 'microxrcedds_agent'

Signed-off-by: David Laseca Perez <davidlaseca@eprosima.com>

---------

Signed-off-by: David Laseca Perez <davidlaseca@eprosima.com>

.github/workflows/ci.yml

@@ -3,7 +3,7 @@ name: CI micro-ROS Agent
 on:
     pull_request:
       branches:
-        - 'jazzy'
+        - 'rolling'
     schedule:
       - cron: '33 6 * * *'
 
@@ -15,15 +15,15 @@ jobs:
         fail-fast: false
         matrix:
           os: [ ubuntu-latest ]
-          ros_distribution: [ jazzy ]
+          ros_distribution: [ rolling ]
           include:
             - docker_image: ubuntu:24.04
-              ros_distribution: jazzy
+              ros_distribution: rolling
       container:
         image: ${{ matrix.docker_image }}
       steps:
       - uses: actions/checkout@v4
-      - uses: ros-tooling/setup-ros@0.7.7
+      - uses: ros-tooling/setup-ros@0.7.13
         with:
           use-ros2-testing: false
           required-ros-distributions: ${{ matrix.ros_distribution }}
@@ -31,7 +31,7 @@ jobs:
         run: |
           apt-get install ros-${{ matrix.ros_distribution }}-micro-ros-msgs
           apt-get install ros-${{ matrix.ros_distribution }}-rmw-fastrtps-cpp
-      - uses : ros-tooling/action-ros-ci@0.3.13
+      - uses : ros-tooling/action-ros-ci@0.4.3
         with:
           package-name: "micro_ros_agent"
           target-ros2-distro: ${{ matrix.ros_distribution }}

micro_ros_agent/CHANGELOG.rst

@@ -2,13 +2,8 @@
 Changelog for package micro-ros_agent
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-5.0.20 (2024-10-14)
--------------------
-* Bump micro-ROS-Agent to Fast DDS v3.0.1 (`#237 <https://github.com/micro-ROS/micro-ROS-Agent/issues/237>`_)
-
-5.0.2 (2024-05-31)
+6.0.0 (2024-05-31)
 ------------------
-* Jazzy Release
 * Bump Micro XRCE-DDS Agent (`#226 <https://github.com/micro-ROS/micro-ROS-Agent/issues/226>`_)
 
 5.0.1 (2024-01-29)

micro_ros_agent/CMakeLists.txt

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.11)
 
 option(UROSAGENT_GENERATE_PROFILE
   "Generates agent.refs according to the .msgs provided in the .repos" OFF
@@ -35,7 +35,6 @@ find_package(microxrcedds_agent REQUIRED)
 find_package(rosidl_cmake REQUIRED)
 find_package(fastcdr REQUIRED)
 find_package(fastdds REQUIRED)
-find_package(fastrtps_cmake_module REQUIRED)
 find_package(rmw_dds_common REQUIRED)
 find_package(rmw REQUIRED)
 find_package(rcutils REQUIRED)
@@ -63,16 +62,15 @@ target_include_directories(${PROJECT_NAME}
     include
   )
 
-ament_target_dependencies(${PROJECT_NAME}
-  rosidl_typesupport_fastrtps_cpp
-  rosidl_runtime_cpp
-  rosidl_typesupport_cpp
-  fastcdr
-  fastdds
-  rmw_dds_common
-  rmw
-  rmw_fastrtps_shared_cpp
-  micro_ros_msgs
+target_link_libraries(${PROJECT_NAME}
+  ${micro_ros_msgs_TARGETS}
+  ${rmw_dds_common_TARGETS}
+  rmw::rmw
+  rmw_dds_common::rmw_dds_common_library
+  rmw_fastrtps_shared_cpp::rmw_fastrtps_shared_cpp
+  rosidl_runtime_cpp::rosidl_runtime_cpp
+  rosidl_typesupport_cpp::rosidl_typesupport_cpp
+  rosidl_typesupport_fastrtps_cpp::rosidl_typesupport_fastrtps_cpp
   )
 
 target_link_libraries(${PROJECT_NAME}

micro_ros_agent/cmake/SuperBuild.cmake

@@ -19,14 +19,14 @@ unset(_deps)
 enable_language(C)
 enable_language(CXX)
 
-unset(xrceagent_DIR CACHE)
-find_package(xrceagent 3 EXACT QUIET)
-if(NOT xrceagent_FOUND)
-    ExternalProject_Add(xrceagent
+unset(microxrcedds_agent_DIR CACHE)
+find_package(microxrcedds_agent 3.0.2 QUIET)
+if(NOT microxrcedds_agent_FOUND)
+    ExternalProject_Add(microxrcedds_agent
             GIT_REPOSITORY
                 https://github.com/eProsima/Micro-XRCE-DDS-Agent.git
             GIT_TAG
-                v3.0.0
+                v3.0.2
             PREFIX
                 ${PROJECT_BINARY_DIR}/agent
             INSTALL_DIR
@@ -51,6 +51,7 @@ if(NOT xrceagent_FOUND)
                 -DUAGENT_BUILD_EXECUTABLE:BOOL=OFF
                 -DUAGENT_ISOLATED_INSTALL:BOOL=OFF
             )
+    list(APPEND _deps microxrcedds_agent)
 endif()
 
 # Main project.
@@ -64,5 +65,5 @@ ExternalProject_Add(micro_ros_agent
     INSTALL_COMMAND
         ""
     DEPENDS
-        xrceagent
+        ${_deps}
     )

micro_ros_agent/package.xml

@@ -2,10 +2,10 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>micro_ros_agent</name>
-  <version>5.0.20</version>
+  <version>6.0.0</version>
   <description>micro-ROS Agent package</description>
-  <maintainer email="pablogarrido@eprosima.com">Pablo Garrido</maintainer>
-  <maintainer email="antoniocuadros@eprosima.com">Antonio Cuadros</maintainer>
+  <maintainer email="eugeniocollado@eprosima.com">Eugenio Collado</maintainer>
+  <maintainer email="davidlaseca@eprosima.com">David Laseca</maintainer>
   <license>Apache License 2.0</license>
 
   <buildtool_depend>ament_cmake</buildtool_depend>
@@ -20,6 +20,7 @@
   <depend>rmw_fastrtps_shared_cpp</depend>
   <depend>rmw_dds_common</depend>
   <depend>micro_ros_msgs</depend>
+  <depend>microxrcedds_agent</depend>
 
   <test_depend>rosidl_typesupport_fastrtps_cpp</test_depend>
   <test_depend>ament_cmake_gtest</test_depend>