Skip to content

Commit

Permalink
Fix thread include (#216)
Browse files Browse the repository at this point in the history
* Fix thread include

Signed-off-by: Pablo Garrido <[email protected]>

* Update CI

* Revert "Fix thread include"

This reverts commit 1427fb6.

* fix

* Fix

Signed-off-by: Pablo Garrido <[email protected]>

---------

Signed-off-by: Pablo Garrido <[email protected]>
(cherry picked from commit cd321ca)

# Conflicts:
#	.github/workflows/ci.yml
  • Loading branch information
pablogs9 authored and mergify[bot] committed Jan 29, 2024
1 parent 1b81530 commit 23861e8
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
9 changes: 9 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,25 @@ jobs:
container:
image: ubuntu:jammy
steps:
<<<<<<< HEAD
- uses: actions/checkout@v2
- uses: ros-tooling/[email protected]
=======
- uses: actions/checkout@v3
- uses: ros-tooling/[email protected]
>>>>>>> cd321ca (Fix thread include (#216))
with:
use-ros2-testing: false
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
<<<<<<< HEAD
- uses : ros-tooling/[email protected]
=======
- uses : ros-tooling/[email protected]
>>>>>>> cd321ca (Fix thread include (#216))
with:
package-name: "micro_ros_agent"
target-ros2-distro: ${{ matrix.ros_distribution }}
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
#include <string>
#include <memory>
#include <map>
#include <thread>

namespace uros {
namespace agent {
Expand Down

0 comments on commit 23861e8

Please sign in to comment.