Skip to content

Commit bcde8cb

Browse files
committed
build_ros2_package_ci
2 errors was injected in two files
1 parent 5593ac6 commit bcde8cb

4 files changed

Lines changed: 65 additions & 5 deletions

File tree

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
name: build_lrs_ROS2_package
2+
3+
on:
4+
push:
5+
branches: ['**']
6+
pull_request:
7+
branches: ['**']
8+
9+
jobs:
10+
11+
build_lrs_ros2_package:
12+
runs-on: ubuntu-latest
13+
strategy:
14+
matrix:
15+
ros_distribution:
16+
- foxy
17+
- galactic
18+
- humble
19+
- rolling
20+
21+
include:
22+
# Foxy Fitzroy
23+
- docker_image: ubuntu:focal
24+
ros_distribution: foxy
25+
26+
# Galactic Geochelone
27+
- docker_image: ubuntu:focal
28+
ros_distribution: galactic
29+
30+
# Humble Hawksbill
31+
- docker_image: ubuntu:jammy
32+
ros_distribution: humble
33+
34+
# Rolling Ridley
35+
- docker_image: ubuntu:jammy
36+
ros_distribution: rolling
37+
38+
container:
39+
image: ${{ matrix.docker_image }}
40+
steps:
41+
42+
- name: setup ROS environment
43+
uses: ros-tooling/setup-ros@v0.4
44+
with:
45+
required-ros-distributions: ${{ matrix.ros_distribution }}
46+
47+
- name: build librealsense ROS 2
48+
uses: ros-tooling/action-ros-ci@v0.2
49+
with:
50+
target-ros2-distro: ${{ matrix.ros_distribution }}
51+
skip-tests: true
52+
colcon-defaults: | # We align the build flags to the librealsense2 ROS2 release build.
53+
{
54+
"build": {
55+
"cmake-args": [
56+
"-DBUILD_GRAPHICAL_EXAMPLES=OFF",
57+
"-DBUILD_EXAMPLES=OFF"
58+
]
59+
}
60+
}

common/model-views.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ using namespace rs2::sw_update;
5252
else if ((width == 640 && height == 480) || (height == 640 && width == 480))
5353
return RS2_SENSOR_MODE_VGA;
5454
else if ((width == 1024 && height == 768) || (height == 768 && width == 1024))
55-
return RS2_SENSOR_MODE_XGA;
55+
return RS2_SENSOR_MODE_XGA
5656
else
5757
return RS2_SENSOR_MODE_COUNT;
5858
}

include/librealsense2/rs.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ namespace rs2
1818
{
1919
inline void log_to_console(rs2_log_severity min_severity)
2020
{
21-
rs2_error* e = nullptr;
21+
rs2_error* e = nullptr
2222
rs2_log_to_console(min_severity, &e);
2323
error::handle(e);
2424
}

package.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0"?>
22

33
<!-- This file is only used to enable the building librealsense2 -->
4-
<!-- as a debian package for use with ROS (http://ros.org) -->
5-
<!-- via catkin_make (which invokes cmake) -->
4+
<!-- as a debian package for use with ROS 2 (http://ros.org) -->
5+
<!-- via ament_cmake (which invokes cmake) -->
66

77
<package format="2">
88
<name>librealsense2</name>
99
<!-- The version tag needs to be updated with each new release of librealsense -->
10-
<version>2.53.0</version>
10+
<version>2.54.0</version>
1111
<description>
1212
Library for controlling and capturing data from the Intel(R) RealSense(TM) D400 devices.
1313
</description>

0 commit comments

Comments
 (0)