Repository navigation
Conversation
This upstreams RoboStack downstream patch `patch/ros-rolling-grid-map-core.patch`. Best-guess rationale: Eigen's EIGEN_EMPTY_STRUCT_CTOR macro is no longer needed for these stateless functors and can trigger compatibility issues with newer Eigen/toolchain combinations. Signed-off-by: Tobias Fischer <info@tobiasfischer.info> (cherry picked from commit f911bbd)
This upstreams RoboStack downstream patch `patch/ros-rolling-grid-map-core.osx.patch`. Best-guess rationale: explicitly defaulting copy construction and assignment keeps BufferRegion and Polygon usable in containers on toolchains that are stricter around implicit special member generation with aligned Eigen types. Signed-off-by: Tobias Fischer <info@tobiasfischer.info> (cherry picked from commit 99e7721)
This upstreams a generalized form of RoboStack build fix patch/ros-rolling-grid-map-pcl.osx.patch. Best guess rationale: processPointcloud records the start time with std::chrono::high_resolution_clock::now(), but the helper accepted a system_clock time_point. Matching the helper parameter to the clock used by the caller avoids implementation-dependent clock type mismatches, including libc++ configurations where high_resolution_clock is not system_clock. Signed-off-by: Tobias Fischer <info@tobiasfischer.info> (cherry picked from commit 1ebb26a)
OpenCV 5 removed the C constants CV_BGR2GRAY, CV_BGRA2GRAY and CV_BGRA2RGB, so GridMapCvConverter.hpp does not compile with it. conda-forge ships OpenCV 5, and RoboStack carries this change as a patch for Lyrical. The cv::COLOR_* constants also exist in OpenCV 3 and 4. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Replace ament_target_dependencies with explicit imported-target linking for the grid_map_ros library. The Lyrical ament toolchain no longer accepts the legacy SYSTEM dependency expansion used here. Linking the exported ROS interface targets directly preserves transitive include paths and libraries, while retaining grid_map_cv's legacy variables until that package exports an imported target. This change allows grid_map_ros 2.4.0 to build on ROS 2 Lyrical and removes the need for downstream CMake patches. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> (cherry picked from commit 99a0dab)
ROS 2 Lyrical removed ament_target_dependencies (ament/ament_cmake#614). CMake then stops with: Unknown CMake command "ament_target_dependencies". Dependencies that export CMake targets link the targets. The grid_map packages that export only variables use <pkg>_LIBRARIES and <pkg>_INCLUDE_DIRS, which is what ament_target_dependencies did. Signed-off-by: Mete Fatih Cırıt <mfc@autoware.org> (cherry picked from commit e3efbf9)
RViz on Lyrical and Rolling uses Qt 6. With Qt 5, the moc output does not match the Qt headers. Find Qt 6 first and fall back to Qt 5, as rviz_common does, and use the versionless qt_wrap_cpp. Signed-off-by: Mete Fatih Cırıt <mfc@autoware.org> (cherry picked from commit f9f2790)
On Ubuntu 26.04, opencv_viz (through grid_map_ros) links VTK targets, and VTK::jsoncpp links JsonCpp::JsonCpp. VTK defines that target only when a caller asks for its jsoncpp component, and PCL does not. The CMake generate step then fails. find_package(jsoncpp) defines the target. Signed-off-by: Mete Fatih Cırıt <mfc@autoware.org> (cherry picked from commit 545f346)
Lyrical deprecates tf2_ros/transform_listener.h, rclcpp::spin_some and ament_index_cpp::get_package_share_directory. The packages build with -Werror, so each warning stops the build. Use tf2_ros/transform_listener.hpp, a SingleThreadedExecutor and get_package_share_path. Signed-off-by: Mete Fatih Cırıt <mfc@autoware.org> (cherry picked from commit 4dad1ee)
OctoMap 1.10.1 and older include <ciso646>, which emits a #warning in C++20. Ubuntu 26.04 ships OctoMap 1.10.0. Keep the warning, but do not make it an error for the one demo that includes OctoMap. Signed-off-by: Mete Fatih Cırıt <mfc@autoware.org> (cherry picked from commit d8c200f)
rviz_common, rviz_rendering and rviz_default_plugins declare Qt with qt-base-dev, libqtcore, libqtgui and libqtwidgets. Use the same keys, so that the plugin follows the Qt version of RViz. Signed-off-by: Mete Fatih Cırıt <mfc@autoware.org> (cherry picked from commit 52d14cb)
grid_map_package() adds -Werror only for GCC and Clang, so the exception follows the same condition. Signed-off-by: Mete Fatih Cırıt <mfc@autoware.org> (cherry picked from commit c27e840)
Lyrical removes tf2/transform_datatypes.h and deprecates tf2_ros/transform_broadcaster.h, tf2_ros/transform_listener.h and ament_index_cpp::get_package_share_directory. The tests build with -Werror, so the tests of grid_map_costmap_2d and grid_map_pcl no longer compile. Use the .hpp headers and get_package_share_path. Signed-off-by: Mete Fatih Cırıt <mfc@autoware.org> (cherry picked from commit 5d0c4e8)
Nav2 now returns the full map size from Costmap2D::getSizeInMetersX and getSizeInMetersY (ros-navigation/navigation2 PR 6028). The test expected half a cell less. Costmap2DROS now declares most parameters in on_configure(), so set_parameter() before configure() throws. Pass the values as parameter overrides, through the constructor that keeps the NodeOptions. Signed-off-by: Mete Fatih Cırıt <mfc@autoware.org> (cherry picked from commit 07c87e0)
The NodeOptions constructor of Costmap2DROS uses the root namespace, so all test costmaps shared the topics /costmap and /footprint and the clear services. Remap the namespace to /<name>, as the name constructor did. Signed-off-by: Mete Fatih Cırıt <mfc@autoware.org> (cherry picked from commit 4b237f0)
The comment described the old set_parameter() setup. test_helpers.hpp does not use ament_index_cpp, and test_helpers.cpp includes it itself. Signed-off-by: Mete Fatih Cırıt <mfc@autoware.org> (cherry picked from commit 3e19669)
rclcpp deprecates subscription callbacks that take std::shared_ptr<MessageT>. Clang reports the deprecation through the template instantiation from create_subscription(), although the rclcpp headers are system headers, so grid_map_visualization and grid_map_demos do not build with -Werror. GCC does not report it. The three callbacks only read the message, so they can take std::shared_ptr<const MessageT>. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The tests declare two Eigen::Array2i variables that they never use. With Eigen 5, Clang reports them with -Wunused-variable, and the test does not build with -Werror. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Signed-off-by: Mete Fatih Cırıt <mfc@autoware.org> (cherry picked from commit 97f8be7)
Signed-off-by: Mete Fatih Cırıt <mfc@autoware.org> (cherry picked from commit 15f134b)
The image comes with ROS packages from the main repository. Without an upgrade, rosdep installs packages from ros2-testing next to older ones from the image. Signed-off-by: Mete Fatih Cırıt <mfc@autoware.org> (cherry picked from commit 158f281)
A new push to the same branch or pull request cancels the older run. The Rolling legs build Nav2 from source and take up to one hour. Signed-off-by: Mete Fatih Cırıt <mfc@autoware.org> (cherry picked from commit e1c0cb6)
The skip keys no longer appear in the check name. The industrial_ci step now also names the two octomap keys, which belong to grid_map_demos, not to Nav2. Signed-off-by: Mete Fatih Cırıt <mfc@autoware.org> (cherry picked from commit e3bc7a9)
This was referenced Nov 14, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
This draft puts together every change that
grid_mapneeds to build and pass its tests on ROS 2 Lyrical, to check them in CI as one set. It is not meant to be merged: the fixes should land through the original PRs.Cherry-picked unchanged from open PRs, with their authors:
ament_target_dependenciesremoval, Qt 6, deprecated APIs, ...), including the commit of Use imported targets for grid_map_ros #545-Wdeprecated-copy-with-dtorwith Clang, and the clock type with libc++Three commits that no PR has yet:
fix: take ConstSharedPtr in the subscription callbacks: rclcpp deprecates callbacks that takestd::shared_ptr<MessageT>. Clang reports this through the template instantiation even from the rclcpp system headers, sogrid_map_visualizationandgrid_map_demosfail with-Werror. GCC does not report it.fix(grid_map_cv): use the cv::COLOR_* constants: OpenCV 5 removedCV_BGR2GRAYand the other C constants.test(grid_map_core): remove unused variables in SubmapIteratorTest: with Eigen 5, Clang reports them with-Wunused-variable.How it was tested
Locally with the RoboStack Lyrical packages (pixi, osx-arm64, Clang 21, Eigen 5.0.1, OpenCV 5.0.0, Qt 6.12, PCL 1.15.1), on the same tree without the CI changes:
colcon buildbuilds all 15 packages.colcon testgives841 tests, 0 errors, 0 failures, 195 skipped.<ciso646>workarounds of fix: build on ROS 2 Lyrical #551 only apply to Ubuntu 26.04: conda-forge has noopencv_viz, and its OctoMap 1.10.1 no longer includes<ciso646>;The CI of this PR checks the Ubuntu 26.04 side.
🤖 Generated with Claude Code