ros2 / rosbag2

Apache License 2.0
285 stars 251 forks source link

[humble] Bugfix for rosbag2_cpp serialization converter (backport #1814) (backport #1823) #1824

Closed mergify[bot] closed 1 month ago

mergify[bot] commented 1 month ago
mergify[bot] commented 1 month ago

Cherry-pick of a269cd4106e25bce316c8fde10cdce06467a1339 has failed:

On branch mergify/bp/humble/pr-1823
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit a269cd4.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
    modified:   rosbag2_cpp/include/rosbag2_cpp/converter_interfaces/serialization_format_converter.hpp
    modified:   rosbag2_cpp/include/rosbag2_cpp/converter_interfaces/serialization_format_deserializer.hpp
    modified:   rosbag2_cpp/include/rosbag2_cpp/converter_interfaces/serialization_format_serializer.hpp
    renamed:    rosbag2_cpp/src/rosbag2_cpp/rmw_implemented_serialization_format_converter.hpp -> rosbag2_cpp/include/rosbag2_cpp/rmw_implemented_serialization_format_converter.hpp
    modified:   rosbag2_cpp/package.xml
    modified:   rosbag2_cpp/src/rosbag2_cpp/converter.cpp
    modified:   rosbag2_cpp/src/rosbag2_cpp/rmw_implemented_serialization_format_converter.cpp
    modified:   rosbag2_cpp/src/rosbag2_cpp/serialization_format_converter_factory_impl.hpp
    new file:   rosbag2_cpp/test/rosbag2_cpp/test_serialization_converter.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   rosbag2_cpp/CMakeLists.txt

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

MichaelOrlov commented 1 month ago

Pulls: ros2/rosbag2#1824 Gist: https://gist.githubusercontent.com/MichaelOrlov/e08ec6439898af38def3bacc4ede761f/raw/e32d365aa99637cfe60e8a46a7ca15b190aae43e/ros2.repos BUILD args: --packages-above-and-dependencies rosbag2_cpp TEST args: --packages-above rosbag2_cpp ROS Distro: humble Job: ci_launcher ci_launcher ran: https://ci.ros2.org/job/ci_launcher/14651

MichaelOrlov commented 1 month ago

Re-run CI after an attempt to fix RHEL8 linker errors by switching to the rcpputils::fs Pulls: ros2/rosbag2#1824 Gist: https://gist.githubusercontent.com/MichaelOrlov/e08ec6439898af38def3bacc4ede761f/raw/e32d365aa99637cfe60e8a46a7ca15b190aae43e/ros2.repos BUILD args: --packages-above-and-dependencies rosbag2_cpp TEST args: --packages-above rosbag2_cpp ROS Distro: humble Job: ci_launcher ci_launcher ran: https://ci.ros2.org/job/ci_launcher/14652

MichaelOrlov commented 1 month ago

Warnings in RHEL 8 build with messages no CONNEXTDDS_DIR nor NDDSHOME specified is a known issue and unrelated to the changes from this PR. Merging then.