From b0ebf5ab3fee77584b1962cf69ce74ed70968fd0 Mon Sep 17 00:00:00 2001 From: Antonio Cuadros <49162117+Acuadros95@users.noreply.github.com> Date: Fri, 20 May 2022 12:35:11 +0200 Subject: [PATCH 01/20] Humble release (#135) * Modify CI * Update Signed-off-by: Pablo Garrido * Update Signed-off-by: Pablo Garrido * Update .github/workflows/ci.yml * Update .github/workflows/ci.yml * Modify CI * Update to ubuntu latest * Use pre-release repository * Use ubuntu-20.04 * Fix * Revert changes Co-authored-by: Pablo Garrido --- .github/workflows/ci.yml | 57 ++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 29 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a92fb00..0855c23 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,36 +3,35 @@ name: CI micro-ROS Agent on: pull_request: branches: - - '**' + - 'humble' + schedule: + - cron: '33 6 * * *' jobs: microros_agent_ci: - runs-on: ubuntu-20.04 - container: microros/base:rolling - - steps: - - uses: actions/checkout@v2 - with: - path: urosagent - - - name: Download dependencies - run: | - apt update - cd /uros_ws - . /opt/ros/$ROS_DISTRO/setup.sh - . install/local_setup.sh - rosdep update --rosdistro=$ROS_DISTRO - ros2 run micro_ros_setup create_agent_ws.sh - - - name: Patch branch - run: | - rm -rf /uros_ws/src/uros/micro-ROS-Agent/* - cp -R urosagent/* /uros_ws/src/uros/micro-ROS-Agent/ - - - name: Build - run: | - cd /uros_ws - . /opt/ros/$ROS_DISTRO/setup.sh - . install/local_setup.sh - ros2 run micro_ros_setup build_agent.sh \ No newline at end of file + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + os: [ ubuntu-20.04 ] + ros_distribution: [ humble ] + include: + - docker_image: ubuntu:jammy + ros_distribution: humble + container: + image: ubuntu:jammy + steps: + - uses: actions/checkout@v2 + - uses: ros-tooling/setup-ros@0.3.2 + with: + use-ros2-testing: true + required-ros-distributions: ${{ matrix.ros_distribution }} + - name : Download and install dependencies + 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.2.5 + with: + package-name: "micro_ros_agent" + target-ros2-distro: ${{ matrix.ros_distribution }} From 114a043ee237513cc8e37edb9c5e131cb25610ad Mon Sep 17 00:00:00 2001 From: Antonio Cuadros <49162117+Acuadros95@users.noreply.github.com> Date: Tue, 24 May 2022 11:11:32 +0200 Subject: [PATCH 02/20] Revert test humble release (#142) --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0855c23..0b9b07a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: - uses: actions/checkout@v2 - uses: ros-tooling/setup-ros@0.3.2 with: - use-ros2-testing: true + use-ros2-testing: false required-ros-distributions: ${{ matrix.ros_distribution }} - name : Download and install dependencies run: | From b5a0d0b6ee979b999d0dc40e3f2d654cdee1f67d Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Wed, 25 May 2022 09:09:27 +0200 Subject: [PATCH 03/20] Update changelog --- micro_ros_agent/CHANGELOG.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/micro_ros_agent/CHANGELOG.rst b/micro_ros_agent/CHANGELOG.rst index 499235d..e611bf0 100644 --- a/micro_ros_agent/CHANGELOG.rst +++ b/micro_ros_agent/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package micro-ros_agent ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 3.0.1 (2022-03-25) ------------------ * Add services to graph manager (`#127 `_) (`#129 `_) From 4a750220d290a565e4f0cea4fb4cb50f829cea24 Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Wed, 25 May 2022 09:09:39 +0200 Subject: [PATCH 04/20] 3.0.2 --- micro_ros_agent/CHANGELOG.rst | 4 ++-- micro_ros_agent/package.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/micro_ros_agent/CHANGELOG.rst b/micro_ros_agent/CHANGELOG.rst index e611bf0..26b2f8f 100644 --- a/micro_ros_agent/CHANGELOG.rst +++ b/micro_ros_agent/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package micro-ros_agent ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +3.0.2 (2022-05-25) +------------------ 3.0.1 (2022-03-25) ------------------ diff --git a/micro_ros_agent/package.xml b/micro_ros_agent/package.xml index a61a21e..8923823 100644 --- a/micro_ros_agent/package.xml +++ b/micro_ros_agent/package.xml @@ -2,7 +2,7 @@ micro_ros_agent - 3.0.1 + 3.0.2 micro-ROS Agent package Pablo Garrido Antonio Cuadros From c89776e1fd2b7a08f0bcdccdf0d40e4287b28b1f Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Wed, 8 Jun 2022 14:12:55 +0200 Subject: [PATCH 05/20] Fix memory leak in graph manager (#147) Signed-off-by: Pablo Garrido --- .../include/agent/graph_manager/graph_manager.hpp | 6 ++++++ micro_ros_agent/src/agent/graph_manager/graph_manager.cpp | 8 +++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/micro_ros_agent/include/agent/graph_manager/graph_manager.hpp b/micro_ros_agent/include/agent/graph_manager/graph_manager.hpp index 4365909..c113a96 100644 --- a/micro_ros_agent/include/agent/graph_manager/graph_manager.hpp +++ b/micro_ros_agent/include/agent/graph_manager/graph_manager.hpp @@ -111,6 +111,12 @@ class GraphManager const eprosima::fastdds::dds::DomainParticipant* participant, bool from_microros = true); + /** + * @brief Getter for the graph cache. + * @return Reference to inner graph cache + */ + rmw_dds_common::GraphCache& get_graph_cache() { return graphCache_; } + /** * @brief Adds a DDS datawriter to the graph tree. * @param datawriter_guid rtps::GUID_t of the datawriter to be added. diff --git a/micro_ros_agent/src/agent/graph_manager/graph_manager.cpp b/micro_ros_agent/src/agent/graph_manager/graph_manager.cpp index 2a85a91..69b8f93 100644 --- a/micro_ros_agent/src/agent/graph_manager/graph_manager.cpp +++ b/micro_ros_agent/src/agent/graph_manager/graph_manager.cpp @@ -597,7 +597,7 @@ GraphManager::ParticipantListener::ParticipantListener( } void GraphManager::ParticipantListener::on_participant_discovery( - eprosima::fastdds::dds::DomainParticipant* participant, + eprosima::fastdds::dds::DomainParticipant* /* participant */, eprosima::fastrtps::rtps::ParticipantDiscoveryInfo&& info) { switch (info.status) @@ -614,13 +614,15 @@ void GraphManager::ParticipantListener::on_participant_discovery( const std::string enclave = std::string(name_found->second.begin(), name_found->second.end()); - graphManager_from_->add_participant(participant, false, enclave); + const rmw_gid_t gid = rmw_fastrtps_shared_cpp::create_rmw_gid("rmw_fastrtps_cpp", info.info.m_guid); + graphManager_from_->get_graph_cache().add_participant(gid, enclave); break; } case eprosima::fastrtps::rtps::ParticipantDiscoveryInfo::REMOVED_PARTICIPANT: case eprosima::fastrtps::rtps::ParticipantDiscoveryInfo::DROPPED_PARTICIPANT: { - graphManager_from_->remove_participant(participant, false); + const rmw_gid_t gid = rmw_fastrtps_shared_cpp::create_rmw_gid("rmw_fastrtps_cpp", info.info.m_guid); + graphManager_from_->get_graph_cache().remove_participant(gid); break; } default: From 5f36f4c9435ccf88749e7da7c31d0581bbe4cdcc Mon Sep 17 00:00:00 2001 From: Antonio Cuadros <49162117+Acuadros95@users.noreply.github.com> Date: Thu, 9 Jun 2022 15:38:17 +0200 Subject: [PATCH 06/20] Build ROS2 from source on snap (#153) * Build ROS2 from source on snap * Update --- snap/hooks/configure | 2 +- snap/local/fastdds_no_shared_memory.xml | 19 +++++++ snap/local/micro-ros-agent-daemon | 2 +- snap/snapcraft.yaml | 70 ++++++++++++------------- 4 files changed, 56 insertions(+), 37 deletions(-) create mode 100644 snap/local/fastdds_no_shared_memory.xml diff --git a/snap/hooks/configure b/snap/hooks/configure index d51603c..d0729c7 100755 --- a/snap/hooks/configure +++ b/snap/hooks/configure @@ -101,4 +101,4 @@ case "$daemon" in echo "'$daemon' is not a valid boolean for daemon" >&2 return 1 ;; -esac \ No newline at end of file +esac diff --git a/snap/local/fastdds_no_shared_memory.xml b/snap/local/fastdds_no_shared_memory.xml new file mode 100644 index 0000000..a4f0105 --- /dev/null +++ b/snap/local/fastdds_no_shared_memory.xml @@ -0,0 +1,19 @@ + + + + + CustomUdpTransport + UDPv4 + + + + + + + CustomUdpTransport + + + false + + + diff --git a/snap/local/micro-ros-agent-daemon b/snap/local/micro-ros-agent-daemon index 1ec437e..32dc832 100755 --- a/snap/local/micro-ros-agent-daemon +++ b/snap/local/micro-ros-agent-daemon @@ -24,4 +24,4 @@ if [ -n "$p2p_port" ]; then set -- --p2p "$p2p_port" "$@" fi -exec "$SNAP/lib/micro_ros_agent/micro_ros_agent" "$transport" "$@" +exec "$SNAP/opt/ros/snap/lib/micro_ros_agent/micro_ros_agent" "$transport" "$@" diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 21a0138..4df4e57 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -71,16 +71,6 @@ description: | $ snap set micro-ros-agent device="device path" - If connecting the micro-ROS Agent using an IP based connection mode, - that is, `udp4`, `udp6`, `tcp4` or `tcp6`, care must be taken to - connect first the `micro-ros-agent-shm-netplug` plug. - This is due to the fact that ROS 2 Foxy is using Fast-DDS as the - default DDS middleware, and Fast-DDS comes with *shared memory transport*. - Thus, this plugin must be enabled, in order to gain access to the - `/dev/shm` folder from the snap image, prior to running it: - - $ sudo snap connect micro-ros-agent:micro-ros-agent-shm-netplug - When using the snap with a serial device, some steps need to be taken in order to establish a successful connection: @@ -120,49 +110,59 @@ architectures: - build-on: armhf - build-on: ppc64el +package-repositories: +- components: [main] + formats: [deb] + key-id: C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654 + key-server: keyserver.ubuntu.com + suites: [focal] + type: apt + url: http://repo.ros2.org/ubuntu/main + parts: + ros2-foxy-extension: + build-packages: [ros-foxy-ros-core] + override-build: install -D -m 0755 launch ${SNAPCRAFT_PART_INSTALL}/snap/command-chain/ros2-launch + plugin: nil + source: $SNAPCRAFT_EXTENSIONS_DIR/ros2 uros-agent: plugin: colcon source: . - override-build: | - set +u - git clone https://github.com/eProsima/Micro-XRCE-DDS-Agent.git -b $ROS_DISTRO - git clone https://github.com/eProsima/Micro-CDR.git -b $ROS_DISTRO - git clone https://github.com/micro-ROS/micro_ros_msgs.git -b $ROS_DISTRO - git clone https://github.com/micro-ROS/rosidl_typesupport_microxrcedds.git -b $ROS_DISTRO - git clone https://github.com/micro-ROS/rmw-microxrcedds.git -b $ROS_DISTRO - git clone https://github.com/micro-ROS/micro-ROS-Agent.git -b $ROS_DISTRO - . /opt/ros/$ROS_DISTRO/setup.sh - colcon build --merge-install --install-base $SNAPCRAFT_PRIME --cmake-args "-DUAGENT_BUILD_EXECUTABLE=OFF -DUAGENT_USE_SYSTEM_FASTDDS=ON" --packages-up-to micro_ros_agent - set -u + colcon-cmake-args: + - -DMICROROSAGENT_SUPERBUILD=ON + - --cmake-force-configure + override-pull: | + snapcraftctl pull + + version="$(git describe --always --tags| sed -e 's/^v//;s/-/+git/;y/-/./')" + [ -n "$(echo $version | grep "+git")" ] && grade=devel || grade=stable + snapcraftctl set-version "$version" + snapcraftctl set-grade "$grade" + build-packages: [make, gcc, g++] stage-packages: [ros-foxy-ros2launch] + build-environment: + - ROS_VERSION: '2' + - ROS_DISTRO: foxy runner: plugin: dump source: snap/local/ organize: - '*': usr/bin/ - -plugs: - micro-ros-agent-shm-netplug: - interface: system-files - allow-auto-connection: true - write: - - /dev/shm + 'micro-ros-agent-daemon': usr/bin/ + 'fastdds_no_shared_memory.xml': usr/share/ apps: micro-ros-agent: - command: lib/micro_ros_agent/micro_ros_agent + command: opt/ros/snap/lib/micro_ros_agent/micro_ros_agent environment: - LD_LIBRARY_PATH: "$LD_LIBRARY_PATH:$SNAP/lib" - plugs: [network, network-bind, serial-port, micro-ros-agent-shm-netplug] - extensions: [ros2-foxy] + FASTRTPS_DEFAULT_PROFILES_FILE: ${SNAP}/usr/share/fastdds_no_shared_memory.xml + plugs: [network, network-bind, serial-port] daemon: command: usr/bin/micro-ros-agent-daemon environment: - LD_LIBRARY_PATH: "$LD_LIBRARY_PATH:$SNAP/lib" + FASTRTPS_DEFAULT_PROFILES_FILE: ${SNAP}/usr/share/fastdds_no_shared_memory.xml daemon: simple - plugs: [network, network-bind, serial-port, micro-ros-agent-shm-netplug] + plugs: [network, network-bind, serial-port] From c1e0ce9df782719a111da9499651470969f2db88 Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Mon, 13 Jun 2022 07:46:11 +0200 Subject: [PATCH 07/20] Changelog Signed-off-by: Pablo Garrido --- micro_ros_agent/CHANGELOG.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/micro_ros_agent/CHANGELOG.rst b/micro_ros_agent/CHANGELOG.rst index 26b2f8f..a68bfe1 100644 --- a/micro_ros_agent/CHANGELOG.rst +++ b/micro_ros_agent/CHANGELOG.rst @@ -2,6 +2,10 @@ Changelog for package micro-ros_agent ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- +* Fix memory leak in graph manager (`#147 `_) + 3.0.2 (2022-05-25) ------------------ From da7fb682e9594294302bce5ef404f5dd9618f7b1 Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Mon, 13 Jun 2022 07:46:16 +0200 Subject: [PATCH 08/20] 3.0.3 --- micro_ros_agent/CHANGELOG.rst | 4 ++-- micro_ros_agent/package.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/micro_ros_agent/CHANGELOG.rst b/micro_ros_agent/CHANGELOG.rst index a68bfe1..96b098a 100644 --- a/micro_ros_agent/CHANGELOG.rst +++ b/micro_ros_agent/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package micro-ros_agent ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +3.0.3 (2022-06-13) +------------------ * Fix memory leak in graph manager (`#147 `_) 3.0.2 (2022-05-25) diff --git a/micro_ros_agent/package.xml b/micro_ros_agent/package.xml index 8923823..7b70937 100644 --- a/micro_ros_agent/package.xml +++ b/micro_ros_agent/package.xml @@ -2,7 +2,7 @@ micro_ros_agent - 3.0.2 + 3.0.3 micro-ROS Agent package Pablo Garrido Antonio Cuadros From d4be8403327d1b96ccca5f5e01d1719799668a80 Mon Sep 17 00:00:00 2001 From: cmraaron <102722879+cmraaron@users.noreply.github.com> Date: Fri, 19 Aug 2022 09:17:36 +0200 Subject: [PATCH 09/20] Synchronise predicate (#160) * ensure synchronised access to our predicate Signed-off-by: Aaron * release lock before signalling Signed-off-by: Aaron Signed-off-by: Aaron --- micro_ros_agent/src/agent/graph_manager/graph_manager.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/micro_ros_agent/src/agent/graph_manager/graph_manager.cpp b/micro_ros_agent/src/agent/graph_manager/graph_manager.cpp index 69b8f93..3338c97 100644 --- a/micro_ros_agent/src/agent/graph_manager/graph_manager.cpp +++ b/micro_ros_agent/src/agent/graph_manager/graph_manager.cpp @@ -126,8 +126,10 @@ GraphManager::GraphManager(eprosima::fastdds::dds::DomainId_t domain_id) // Set graph cache on change callback function graphCache_.set_on_change_callback([this]() { - std::unique_lock lock(this->mtx_); - this->graph_changed_ = true; + { + std::unique_lock lock(this->mtx_); + this->graph_changed_ = true; + } this->cv_.notify_one(); }); @@ -144,6 +146,7 @@ inline void GraphManager::publish_microros_graph() { return this->graph_changed_; }); + graph_changed_ = false; } if (display_on_change_) @@ -151,7 +154,6 @@ inline void GraphManager::publish_microros_graph() std::cout << "Updated uros Graph: graph changed" << std::endl; std::cout << graphCache_ << std::endl; } - graph_changed_ = false; micro_ros_msgs::msg::Graph graph_message; From 4f686e8dc1e38cf2317055249c763b238a85f5c5 Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Tue, 23 Aug 2022 12:42:03 +0200 Subject: [PATCH 10/20] Fix Datawriter destruction (#169) Signed-off-by: Pablo Garrido Signed-off-by: Pablo Garrido --- .../include/agent/graph_manager/graph_manager.hpp | 2 +- micro_ros_agent/src/agent/graph_manager/graph_manager.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/micro_ros_agent/include/agent/graph_manager/graph_manager.hpp b/micro_ros_agent/include/agent/graph_manager/graph_manager.hpp index c113a96..d6df8d0 100644 --- a/micro_ros_agent/include/agent/graph_manager/graph_manager.hpp +++ b/micro_ros_agent/include/agent/graph_manager/graph_manager.hpp @@ -305,7 +305,7 @@ class GraphManager // Store a auxiliary publishers and datawriter for each participant created in micro-ROS std::map< const eprosima::fastdds::dds::DomainParticipant*, - std::unique_ptr + eprosima::fastdds::dds::DataWriter* > micro_ros_graph_datawriters_; }; diff --git a/micro_ros_agent/src/agent/graph_manager/graph_manager.cpp b/micro_ros_agent/src/agent/graph_manager/graph_manager.cpp index 3338c97..5c9e9df 100644 --- a/micro_ros_agent/src/agent/graph_manager/graph_manager.cpp +++ b/micro_ros_agent/src/agent/graph_manager/graph_manager.cpp @@ -322,11 +322,10 @@ void GraphManager::add_participant( if (it == micro_ros_graph_datawriters_.end()) { // Create datawriter - std::unique_ptr datawriter; - datawriter.reset(publisher_->create_datawriter(ros_discovery_topic_.get(), datawriter_qos_)); + eprosima::fastdds::dds::DataWriter * datawriter = publisher_->create_datawriter(ros_discovery_topic_.get(), datawriter_qos_); it = micro_ros_graph_datawriters_.insert( - std::make_pair(participant, std::move(datawriter))).first; + std::make_pair(participant, datawriter)).first; } it->second->write(static_cast(&info)); @@ -346,8 +345,9 @@ void GraphManager::remove_participant( rmw_dds_common::convert_gid_to_msg(&gid, &info.gid); auto it = micro_ros_graph_datawriters_.find(participant); it->second->write(static_cast(&info)); + publisher_->delete_datawriter(it->second); + micro_ros_graph_datawriters_.erase(participant); } - micro_ros_graph_datawriters_.erase(participant); } void GraphManager::add_datawriter( From d1b916ced24835e9bf24dbe84d06b6b6592825d1 Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Wed, 28 Sep 2022 15:57:04 +0200 Subject: [PATCH 11/20] Changelog --- micro_ros_agent/CHANGELOG.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/micro_ros_agent/CHANGELOG.rst b/micro_ros_agent/CHANGELOG.rst index 96b098a..5717ffa 100644 --- a/micro_ros_agent/CHANGELOG.rst +++ b/micro_ros_agent/CHANGELOG.rst @@ -2,6 +2,11 @@ Changelog for package micro-ros_agent ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- +* Fix Datawriter destruction (`#169 `_) +* Synchronise predicate (`#160 `_) + 3.0.3 (2022-06-13) ------------------ * Fix memory leak in graph manager (`#147 `_) From 0e41ea652238bd0123f6249d69b533d282882dd6 Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Wed, 28 Sep 2022 15:57:21 +0200 Subject: [PATCH 12/20] 3.0.4 --- micro_ros_agent/CHANGELOG.rst | 4 ++-- micro_ros_agent/package.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/micro_ros_agent/CHANGELOG.rst b/micro_ros_agent/CHANGELOG.rst index 5717ffa..489672d 100644 --- a/micro_ros_agent/CHANGELOG.rst +++ b/micro_ros_agent/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package micro-ros_agent ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +3.0.4 (2022-09-28) +------------------ * Fix Datawriter destruction (`#169 `_) * Synchronise predicate (`#160 `_) diff --git a/micro_ros_agent/package.xml b/micro_ros_agent/package.xml index 7b70937..ace9468 100644 --- a/micro_ros_agent/package.xml +++ b/micro_ros_agent/package.xml @@ -2,7 +2,7 @@ micro_ros_agent - 3.0.3 + 3.0.4 micro-ROS Agent package Pablo Garrido Antonio Cuadros From 7ddbf4d245c78821adef76f56c40aa5534e442ec Mon Sep 17 00:00:00 2001 From: acuadros95 Date: Tue, 6 Jun 2023 09:41:25 +0000 Subject: [PATCH 13/20] Changelog Signed-off-by: acuadros95 --- micro_ros_agent/CHANGELOG.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/micro_ros_agent/CHANGELOG.rst b/micro_ros_agent/CHANGELOG.rst index 489672d..2350592 100644 --- a/micro_ros_agent/CHANGELOG.rst +++ b/micro_ros_agent/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package micro-ros_agent ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- + 3.0.4 (2022-09-28) ------------------ * Fix Datawriter destruction (`#169 `_) From 1b815304e9432bb843d7258d8e38594954f79bab Mon Sep 17 00:00:00 2001 From: acuadros95 Date: Tue, 6 Jun 2023 09:41:33 +0000 Subject: [PATCH 14/20] 3.0.5 --- micro_ros_agent/CHANGELOG.rst | 4 ++-- micro_ros_agent/package.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/micro_ros_agent/CHANGELOG.rst b/micro_ros_agent/CHANGELOG.rst index 2350592..f12a198 100644 --- a/micro_ros_agent/CHANGELOG.rst +++ b/micro_ros_agent/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package micro-ros_agent ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +3.0.5 (2023-06-06) +------------------ 3.0.4 (2022-09-28) ------------------ diff --git a/micro_ros_agent/package.xml b/micro_ros_agent/package.xml index ace9468..598e77b 100644 --- a/micro_ros_agent/package.xml +++ b/micro_ros_agent/package.xml @@ -2,7 +2,7 @@ micro_ros_agent - 3.0.4 + 3.0.5 micro-ROS Agent package Pablo Garrido Antonio Cuadros From dd37f06a86ebeed5a13432a5277b902fbc58ca9c Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 29 Jan 2024 16:27:06 +0100 Subject: [PATCH 15/20] Fix thread include (backport #216) (#217) * Fix thread include (#216) * Fix thread include Signed-off-by: Pablo Garrido * Update CI * Revert "Fix thread include" This reverts commit 1427fb6246c46a0b5851a017ddc886abd80d895b. * fix * Fix Signed-off-by: Pablo Garrido --------- Signed-off-by: Pablo Garrido (cherry picked from commit cd321caabe5f7caa012ccfa73d0caef63b9789a1) # Conflicts: # .github/workflows/ci.yml * Fix conflicts --------- Co-authored-by: Pablo Garrido --- .github/workflows/ci.yml | 6 +++--- .../include/agent/graph_manager/graph_manager.hpp | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0b9b07a..7a1daa5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,8 +22,8 @@ jobs: container: image: ubuntu:jammy steps: - - uses: actions/checkout@v2 - - uses: ros-tooling/setup-ros@0.3.2 + - uses: actions/checkout@v3 + - uses: ros-tooling/setup-ros@0.7.1 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.2.5 + - uses : ros-tooling/action-ros-ci@0.3.6 with: package-name: "micro_ros_agent" target-ros2-distro: ${{ matrix.ros_distribution }} diff --git a/micro_ros_agent/include/agent/graph_manager/graph_manager.hpp b/micro_ros_agent/include/agent/graph_manager/graph_manager.hpp index d6df8d0..d9cf095 100644 --- a/micro_ros_agent/include/agent/graph_manager/graph_manager.hpp +++ b/micro_ros_agent/include/agent/graph_manager/graph_manager.hpp @@ -65,6 +65,7 @@ #include #include #include +#include namespace uros { namespace agent { From bd9cc7ef49f1d23af4b284de4e608604e37ba066 Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Mon, 29 Jan 2024 16:27:30 +0100 Subject: [PATCH 16/20] Changelog --- micro_ros_agent/CHANGELOG.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/micro_ros_agent/CHANGELOG.rst b/micro_ros_agent/CHANGELOG.rst index f12a198..cc0c8a0 100644 --- a/micro_ros_agent/CHANGELOG.rst +++ b/micro_ros_agent/CHANGELOG.rst @@ -2,6 +2,10 @@ Changelog for package micro-ros_agent ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- +* Fix thread include (backport `#216 `_) (`#217 `_) + 3.0.5 (2023-06-06) ------------------ From 1cb265e752f73003a37cb66ad849f6ef1d9ce695 Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Mon, 29 Jan 2024 16:27:35 +0100 Subject: [PATCH 17/20] 3.0.6 --- micro_ros_agent/CHANGELOG.rst | 4 ++-- micro_ros_agent/package.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/micro_ros_agent/CHANGELOG.rst b/micro_ros_agent/CHANGELOG.rst index cc0c8a0..05f301d 100644 --- a/micro_ros_agent/CHANGELOG.rst +++ b/micro_ros_agent/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package micro-ros_agent ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +3.0.6 (2024-01-29) +------------------ * Fix thread include (backport `#216 `_) (`#217 `_) 3.0.5 (2023-06-06) diff --git a/micro_ros_agent/package.xml b/micro_ros_agent/package.xml index 598e77b..c49f363 100644 --- a/micro_ros_agent/package.xml +++ b/micro_ros_agent/package.xml @@ -2,7 +2,7 @@ micro_ros_agent - 3.0.5 + 3.0.6 micro-ROS Agent package Pablo Garrido Antonio Cuadros From 30377bbd86ff7ea93ca69a3b37997fd235385e1f Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Mon, 25 Nov 2024 19:21:46 +0100 Subject: [PATCH 18/20] Fix Micro XRCE-DDS Agent tag (#241) --- micro_ros_agent/cmake/SuperBuild.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/micro_ros_agent/cmake/SuperBuild.cmake b/micro_ros_agent/cmake/SuperBuild.cmake index bead827..46f4ed2 100644 --- a/micro_ros_agent/cmake/SuperBuild.cmake +++ b/micro_ros_agent/cmake/SuperBuild.cmake @@ -26,7 +26,7 @@ if(NOT xrceagent_FOUND) GIT_REPOSITORY https://github.com/eProsima/Micro-XRCE-DDS-Agent.git GIT_TAG - ros2 + v2.4.2 PREFIX ${PROJECT_BINARY_DIR}/agent INSTALL_DIR From 48fa98a9219e203cc4d9f5de145fd31a4e05e48f Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 3 Jun 2025 11:20:04 +0200 Subject: [PATCH 19/20] Bump setup-ros and action-ros-ci (backport #249) (#251) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Bump setup-ros and action-ros-ci (#249) Signed-off-by: Antón Casas (cherry picked from commit 0e6e8e36730e6fe1654d0778fe87ff7002b02577) # Conflicts: # .github/workflows/ci.yml * Merge conflicts Signed-off-by: Antón Casas --------- Signed-off-by: Antón Casas Co-authored-by: Antón Casas --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7a1daa5..21fbfe2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,8 +22,8 @@ jobs: container: image: ubuntu:jammy steps: - - uses: actions/checkout@v3 - - uses: ros-tooling/setup-ros@0.7.1 + - uses: actions/checkout@v4 + - 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.6 + - uses : ros-tooling/action-ros-ci@0.4.3 with: package-name: "micro_ros_agent" target-ros2-distro: ${{ matrix.ros_distribution }} From 4f363a79ae96aed39dcc5269f53f73f6a70d3a2c Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 16 Sep 2025 09:34:39 +0200 Subject: [PATCH 20/20] Update maintainers (#259) (#260) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit e733b4b0a1b6e0b57e35aa4e5c381a47ea5ecd69) Co-authored-by: Antón Casas --- micro_ros_agent/package.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/micro_ros_agent/package.xml b/micro_ros_agent/package.xml index c49f363..23d6ec4 100644 --- a/micro_ros_agent/package.xml +++ b/micro_ros_agent/package.xml @@ -4,8 +4,8 @@ micro_ros_agent 3.0.6 micro-ROS Agent package - Pablo Garrido - Antonio Cuadros + Eugenio Collado + Carlos Espinoza Apache License 2.0 ament_cmake