Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .github/workflows/ros2_ci_jazzy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,9 @@ on:
jobs:
build-and-test:
runs-on: ubuntu-24.04
container:
image: rostooling/setup-ros-docker:ubuntu-noble-latest # other tags: https://hub.docker.com/r/rostooling/setup-ros-docker/tags
steps:
- name: Setup ROS
uses: ros-tooling/setup-ros@v0.7
with:
required-ros-distributions: jazzy
- name: Colcon Build & Test
uses: ros-tooling/action-ros-ci@v0.4
with:
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/ros2_ci_rolling.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,9 @@ on:
jobs:
build-and-test:
runs-on: ubuntu-latest
container:
image: rostooling/setup-ros-docker:ubuntu-resolute-latest # other tags: https://hub.docker.com/r/rostooling/setup-ros-docker/tags
steps:
- name: Setup ROS
uses: ros-tooling/setup-ros@v0.7
with:
required-ros-distributions: rolling
- name: Colcon Build & Test
uses: ros-tooling/action-ros-ci@v0.4
with:
Expand Down
6 changes: 5 additions & 1 deletion roboreg_base/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@
maintainer_email="m.huber_1994@hotmail.de",
description="Data collection utilities for the ROS 2 roboreg integration..",
license="Apache-2.0",
tests_require=["pytest"],
extras_require={
"test": [
"pytest",
],
},
entry_points={
"console_scripts": [
"broadcaster = scripts.broadcaster_node:main",
Expand Down
2 changes: 1 addition & 1 deletion roboreg_idl/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.8)
cmake_minimum_required(VERSION 3.22)
project(roboreg_idl)

if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
Expand Down
3 changes: 3 additions & 0 deletions roboreg_idl/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
<license>Apache-2.0</license>

<buildtool_depend>ament_cmake</buildtool_depend>
<buildtool_depend>rosidl_default_generators</buildtool_depend>

<exec_depend>rosidl_default_runtime</exec_depend>

<test_depend>ament_lint_auto</test_depend>
<test_depend>ament_lint_common</test_depend>
Expand Down
18 changes: 9 additions & 9 deletions roboreg_rviz/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.8)
cmake_minimum_required(VERSION 3.22)
project(roboreg_rviz)

if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
Expand All @@ -22,13 +22,13 @@ find_package(pluginlib REQUIRED)
set(CMAKE_AUTOMOC ON) # for Qt MOC

set(roboreg_rviz_dependencies
rclcpp
rviz_common
roboreg_idl
sensor_msgs
std_msgs
std_srvs
pluginlib
rclcpp::rclcpp
rviz_common::rviz_common
roboreg_idl::roboreg_idl
sensor_msgs::sensor_msgs
std_msgs::std_msgs
std_srvs::std_srvs
pluginlib::pluginlib
)

add_library(
Expand All @@ -49,7 +49,7 @@ target_include_directories(
$<INSTALL_INTERFACE:include>
)

ament_target_dependencies(
target_link_libraries(
roboreg_rviz
${roboreg_rviz_dependencies}
)
Expand Down
Loading