From 23861e8deb5950cf0cb797faad70b7e98733bfc7 Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Mon, 29 Jan 2024 16:19:46 +0100 Subject: [PATCH 1/2] 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 --- .github/workflows/ci.yml | 9 +++++++++ .../include/agent/graph_manager/graph_manager.hpp | 1 + 2 files changed, 10 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0b9b07a..309cc78 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,8 +22,13 @@ jobs: container: image: ubuntu:jammy steps: +<<<<<<< HEAD - uses: actions/checkout@v2 - uses: ros-tooling/setup-ros@0.3.2 +======= + - uses: actions/checkout@v3 + - uses: ros-tooling/setup-ros@0.7.1 +>>>>>>> cd321ca (Fix thread include (#216)) with: use-ros2-testing: false required-ros-distributions: ${{ matrix.ros_distribution }} @@ -31,7 +36,11 @@ jobs: run: | apt-get install ros-${{ matrix.ros_distribution }}-micro-ros-msgs apt-get install ros-${{ matrix.ros_distribution }}-rmw-fastrtps-cpp +<<<<<<< HEAD - uses : ros-tooling/action-ros-ci@0.2.5 +======= + - uses : ros-tooling/action-ros-ci@0.3.6 +>>>>>>> cd321ca (Fix thread include (#216)) 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 e9ca7b7912b0b279aa3201806784d454580e1660 Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Mon, 29 Jan 2024 16:22:10 +0100 Subject: [PATCH 2/2] Fix conflicts --- .github/workflows/ci.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 309cc78..7a1daa5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,13 +22,8 @@ jobs: container: image: ubuntu:jammy steps: -<<<<<<< HEAD - - uses: actions/checkout@v2 - - uses: ros-tooling/setup-ros@0.3.2 -======= - uses: actions/checkout@v3 - uses: ros-tooling/setup-ros@0.7.1 ->>>>>>> cd321ca (Fix thread include (#216)) with: use-ros2-testing: false required-ros-distributions: ${{ matrix.ros_distribution }} @@ -36,11 +31,7 @@ jobs: run: | apt-get install ros-${{ matrix.ros_distribution }}-micro-ros-msgs apt-get install ros-${{ matrix.ros_distribution }}-rmw-fastrtps-cpp -<<<<<<< HEAD - - uses : ros-tooling/action-ros-ci@0.2.5 -======= - uses : ros-tooling/action-ros-ci@0.3.6 ->>>>>>> cd321ca (Fix thread include (#216)) with: package-name: "micro_ros_agent" target-ros2-distro: ${{ matrix.ros_distribution }}