Skip to content

Commit b3e3d78

Browse files
Humble main compilation (#5112)
* Changes: * Fix build errors * Fix colcon tests * Remove new dynamic parameter API in RPP * Remove message introspection Signed-off-by: suchetanrs <suchetan.saravanan@gmail.com> * Changes: * Address PR comments. Signed-off-by: suchetanrs <suchetan.saravanan@gmail.com> * Changes: * Fix issue in loopback sim Signed-off-by: suchetanrs <suchetan.saravanan@gmail.com> * Changes: * Use deprecated ParseMultiRobot Signed-off-by: suchetanrs <suchetan.saravanan@gmail.com> * Fix for simulations to run with gazebo fortress Signed-off-by: suchetanrs <suchetan.saravanan@gmail.com> * Fix missing dep in mppi Signed-off-by: suchetanrs <suchetan.saravanan@gmail.com> * Fix more launch issues Signed-off-by: suchetanrs <suchetan.saravanan@gmail.com> * Fix most of the failing tests. Signed-off-by: suchetanrs <suchetan.saravanan@gmail.com> * Configure CI Signed-off-by: suchetanrs <suchetan.saravanan@gmail.com> * Add underlay repos Signed-off-by: suchetanrs <suchetan.saravanan@gmail.com> * Remove GPS tests and fix route server tests Signed-off-by: suchetanrs <suchetan.saravanan@gmail.com> * Remove ament_lint_auto related in all CMakeLists.txt Signed-off-by: suchetanrs <suchetan.saravanan@gmail.com> * Delete lint.yml Signed-off-by: suchetanrs <suchetan.saravanan@gmail.com> * Change spin_all to spin_some Signed-off-by: suchetanrs <suchetan.saravanan@gmail.com> * Fix route_result_future in robot_navigator.py Signed-off-by: suchetanrs <suchetan.saravanan@gmail.com> * Add backport-humble-main to mergify Signed-off-by: suchetanrs <suchetan.saravanan@gmail.com> * Fix underlay.repos file Signed-off-by: suchetanrs <suchetan.saravanan@gmail.com> * Fix common_interfaces branch Signed-off-by: suchetanrs <suchetan.saravanan@gmail.com> --------- Signed-off-by: suchetanrs <suchetan.saravanan@gmail.com> Co-authored-by: suchetanrs <suchetan.saravanan@gmail.com>
1 parent a9814c3 commit b3e3d78

File tree

100 files changed

+476
-432
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+476
-432
lines changed

‎.circleci/config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ _environments:
482482
executors:
483483
release_exec:
484484
docker:
485-
- image: ghcr.io/ros-navigation/navigation2:main
485+
- image: ghcr.io/ros-navigation/navigation2:humble
486486
resource_class: large
487487
working_directory: /opt/overlay_ws
488488
environment:

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"dockerfile": "../Dockerfile",
55
"context": "..",
66
"target": "dever",
7-
"cacheFrom": "ghcr.io/ros-navigation/navigation2:main"
7+
"cacheFrom": "ghcr.io/ros-navigation/navigation2:humble"
88
},
99
"runArgs": [
1010
"--name=nav2"

‎.github/mergify.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,15 @@ pull_request_rules:
2626
branches:
2727
- humble
2828

29+
- name: backport to humble_main at reviewers discretion
30+
conditions:
31+
- base=main
32+
- "label=backport-humble-main"
33+
actions:
34+
backport:
35+
branches:
36+
- humble_main
37+
2938
- name: delete head branch after merge
3039
conditions:
3140
- merged

‎.github/workflows/lint.yml‎

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎.github/workflows/update_ci_image.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010
- main
1111
- jazzy
1212
- humble
13+
- humble_main
1314
paths:
1415
- '**/package.xml'
1516
- '**/*.repos'

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# docker build -t nav2:latest \
77
# --build-arg UNDERLAY_MIXINS \
88
# --build-arg OVERLAY_MIXINS ./
9-
ARG FROM_IMAGE=ros:rolling
9+
ARG FROM_IMAGE=ros:humble
1010
ARG UNDERLAY_WS=/opt/underlay_ws
1111
ARG OVERLAY_WS=/opt/overlay_ws
1212

‎nav2_amcl/CMakeLists.txt‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -146,12 +146,6 @@ install(DIRECTORY include/
146146
)
147147

148148
if(BUILD_TESTING)
149-
find_package(ament_lint_auto REQUIRED)
150-
# the following line skips the linter which checks for copyrights
151-
set(ament_cmake_copyright_FOUND TRUE)
152-
set(ament_cmake_cpplint_FOUND TRUE)
153-
154-
ament_lint_auto_find_test_dependencies()
155149
endif()
156150

157151
ament_export_include_directories("include/${PROJECT_NAME}")

‎nav2_behavior_tree/CMakeLists.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,8 +297,6 @@ install(FILES nav2_tree_nodes.xml DESTINATION share/${PROJECT_NAME})
297297
install(FILES ${GENERATED_DIR}/plugins_list.hpp DESTINATION include/${PROJECT_NAME}/${PROJECT_NAME})
298298

299299
if(BUILD_TESTING)
300-
find_package(ament_lint_auto REQUIRED)
301-
ament_lint_auto_find_test_dependencies()
302300
find_package(ament_cmake_gtest REQUIRED)
303301

304302
ament_find_gtest()

‎nav2_behavior_tree/include/nav2_behavior_tree/bt_action_server_impl.hpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
#include "nav2_msgs/action/navigate_to_pose.hpp"
2828
#include "nav2_behavior_tree/bt_action_server.hpp"
29+
#include "nav2_util/copy_all_parameter_values.hpp"
2930
#include "nav2_util/node_utils.hpp"
3031
#include "rcl_action/action_server.h"
3132
#include "rclcpp_lifecycle/lifecycle_node.hpp"
@@ -164,7 +165,7 @@ bool BtActionServer<ActionT>::on_configure()
164165
node, "robot_base_frame", rclcpp::ParameterValue(std::string("base_link")));
165166
nav2_util::declare_parameter_if_not_declared(
166167
node, "transform_tolerance", rclcpp::ParameterValue(0.1));
167-
rclcpp::copy_all_parameter_values(node, client_node_);
168+
nav2_util::copy_all_parameter_values(node, client_node_);
168169

169170
// set the timeout in seconds for the action server to discard goal handles if not finished
170171
double action_server_result_timeout =

‎nav2_behavior_tree/plugins/decorator/goal_updater_node.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ GoalUpdater::GoalUpdater(
3838
initialize();
3939

4040
// Spin multiple times due to rclcpp regression in Jazzy requiring a 'warm up' spin
41-
callback_group_executor_.spin_all(std::chrono::milliseconds(1));
41+
callback_group_executor_.spin_some();
4242
}
4343

4444
void GoalUpdater::initialize()

0 commit comments

Comments
 (0)