From 75901206b79ee9e3a49a960a970851df40e55ed4 Mon Sep 17 00:00:00 2001 From: wep21 Date: Fri, 24 May 2024 02:16:25 +0900 Subject: [PATCH 1/6] skip installing octomap server temporarily Signed-off-by: wep21 --- .github/workflows/colcon.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/colcon.yaml b/.github/workflows/colcon.yaml index ea0e2b89..e753651d 100644 --- a/.github/workflows/colcon.yaml +++ b/.github/workflows/colcon.yaml @@ -32,7 +32,7 @@ jobs: apt update rosdep update source /opt/ros/${{matrix.config.rosdistro}}/setup.bash - rosdep install --from-paths src --ignore-src -y --skip-keys "slam_toolbox turtlebot3_gazebo gazebo_ros_pkgs" + rosdep install --from-paths src --ignore-src -y --skip-keys "slam_toolbox turtlebot3_gazebo gazebo_ros_pkgs octomap_server" shell: bash - name: Colcon Build (Release) run: | From ee49bf4786355d3ad1b9e8f63db304f9e8755037 Mon Sep 17 00:00:00 2001 From: wep21 Date: Sat, 25 May 2024 11:12:21 +0900 Subject: [PATCH 2/6] suppress warning due to gcc13 bug Signed-off-by: wep21 --- grid_map_core/test/EigenPluginsTest.cpp | 7 +++++++ grid_map_cv/include/grid_map_cv/GridMapCvConverter.hpp | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/grid_map_core/test/EigenPluginsTest.cpp b/grid_map_core/test/EigenPluginsTest.cpp index 4c902b66..e168c591 100644 --- a/grid_map_core/test/EigenPluginsTest.cpp +++ b/grid_map_core/test/EigenPluginsTest.cpp @@ -14,6 +14,13 @@ #include "grid_map_core/grid_map_core.hpp" +// GCC 13 has false positive warnings around array-bounds. +// Suppress them until this is fixed in upstream gcc. See +// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114758 for more details. +#if defined(__GNUC__) && !defined(__clang__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Warray-bounds" +#endif TEST(EigenMatrixBaseAddons, numberOfFinites) { diff --git a/grid_map_cv/include/grid_map_cv/GridMapCvConverter.hpp b/grid_map_cv/include/grid_map_cv/GridMapCvConverter.hpp index 2538b825..233c28a0 100644 --- a/grid_map_cv/include/grid_map_cv/GridMapCvConverter.hpp +++ b/grid_map_cv/include/grid_map_cv/GridMapCvConverter.hpp @@ -20,6 +20,14 @@ #include #include +// GCC 13 has false positive warnings around stringop-overflow. +// Suppress them until this is fixed in upstream gcc. See +// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114758 for more details. +#if defined(__GNUC__) && !defined(__clang__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wstringop-overflow" +#endif + namespace grid_map { From c8f1097653c92d5c8efb7c5ef8359d465fcf2f80 Mon Sep 17 00:00:00 2001 From: Roderick Taylor Date: Tue, 14 May 2024 13:36:55 +1000 Subject: [PATCH 3/6] Rosbag timestamp changes. --- grid_map_ros/src/GridMapRosConverter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grid_map_ros/src/GridMapRosConverter.cpp b/grid_map_ros/src/GridMapRosConverter.cpp index 91ff6d8a..23a6edc4 100644 --- a/grid_map_ros/src/GridMapRosConverter.cpp +++ b/grid_map_ros/src/GridMapRosConverter.cpp @@ -688,7 +688,7 @@ bool GridMapRosConverter::saveToBag( auto bag_message = std::make_shared(); - auto ret = rcutils_system_time_now(&bag_message->time_stamp); + auto ret = rcutils_system_time_now(&bag_message->send_timestamp); if (ret != RCL_RET_OK) { RCLCPP_ERROR(rclcpp::get_logger("saveToBag"), "couldn't assign time rosbag message"); } From 1e4a731a1fc7a5e416475e78d5df767551d169dc Mon Sep 17 00:00:00 2001 From: wep21 Date: Sun, 26 May 2024 10:51:52 +0900 Subject: [PATCH 4/6] change nav2 repo temporarily Signed-off-by: wep21 --- tools/ros2_dependencies.repos | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/ros2_dependencies.repos b/tools/ros2_dependencies.repos index 9a0dc8dd..c400ed42 100644 --- a/tools/ros2_dependencies.repos +++ b/tools/ros2_dependencies.repos @@ -1,5 +1,5 @@ repositories: ros-planning/navigation2: type: git - url: https://github.com/ros-planning/navigation2.git - version: main + url: https://github.com/wep21/navigation2.git + version: rolling From d576a7b1bdb5e72166f8a38e724b722387f6969a Mon Sep 17 00:00:00 2001 From: wep21 Date: Sun, 26 May 2024 14:13:29 +0900 Subject: [PATCH 5/6] apply uncrustify except for EigenLab.hpp Signed-off-by: wep21 --- grid_map_filters/CMakeLists.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/grid_map_filters/CMakeLists.txt b/grid_map_filters/CMakeLists.txt index 9d0cba5a..711302f2 100644 --- a/grid_map_filters/CMakeLists.txt +++ b/grid_map_filters/CMakeLists.txt @@ -136,6 +136,7 @@ if(BUILD_TESTING) list(APPEND AMENT_LINT_AUTO_EXCLUDE ament_cmake_cpplint ament_cmake_copyright + ament_cmake_uncrustify ) ament_lint_auto_find_test_dependencies() @@ -144,6 +145,17 @@ if(BUILD_TESTING) ament_cpplint( FILTERS -legal/copyright -build/include_order ) + + # run uncrustify except for EigenLab.hpp + find_package(ament_cmake_uncrustify) + set( + _linter_excludes + include/EigenLab/EigenLab.hpp + ) + ament_uncrustify( + EXCLUDE ${_linter_excludes} + LANGUAGE c++ + ) endif() ament_lint_auto_find_test_dependencies() endif() From ea6ae3d776af898439202559c6c1fbb55ad56ba3 Mon Sep 17 00:00:00 2001 From: wep21 Date: Sun, 26 May 2024 17:40:51 +0900 Subject: [PATCH 6/6] use pr branch Signed-off-by: wep21 --- tools/ros2_dependencies.repos | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/ros2_dependencies.repos b/tools/ros2_dependencies.repos index c400ed42..23d88992 100644 --- a/tools/ros2_dependencies.repos +++ b/tools/ros2_dependencies.repos @@ -1,5 +1,6 @@ repositories: ros-planning/navigation2: type: git - url: https://github.com/wep21/navigation2.git - version: rolling + # back to upstream main after https://github.com/ros-navigation/navigation2/pull/4298 is merged + url: https://github.com/tonynajjar/navigation2.git + version: fix-devcontainer