Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[humble] rosbag2_storage: expose default storage ID as method (backport #1146) #1724

Merged
merged 2 commits into from
Jun 22, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 22, 2024

Signed-off-by: James Smith [email protected]

Fixes #1116


This is an automatic backport of pull request #1146 done by Mergify.

* rosbag2_storage: expose default storage ID as method

Signed-off-by: James Smith <[email protected]>
(cherry picked from commit c611a80)

# Conflicts:
#	ros2bag/ros2bag/verb/record.py
#	rosbag2_cpp/src/rosbag2_cpp/writer.cpp
#	rosbag2_py/rosbag2_py/__init__.py
Copy link
Author

mergify bot commented Jun 22, 2024

Cherry-pick of c611a80 has failed:

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

You are currently cherry-picking commit c611a80.
  (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_py/src/rosbag2_py/_writer.cpp
	modified:   rosbag2_storage/CMakeLists.txt
	new file:   rosbag2_storage/include/rosbag2_storage/default_storage_id.hpp
	new file:   rosbag2_storage/src/rosbag2_storage/default_storage_id.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ros2bag/ros2bag/verb/record.py
	both modified:   rosbag2_cpp/src/rosbag2_cpp/writer.cpp
	both modified:   rosbag2_py/rosbag2_py/__init__.py

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

@mergify mergify bot requested a review from a team as a code owner June 22, 2024 19:23
@mergify mergify bot added the conflicts label Jun 22, 2024
@mergify mergify bot requested review from emersonknapp and james-rms and removed request for a team June 22, 2024 19:23
@MichaelOrlov MichaelOrlov changed the title rosbag2_storage: expose default storage ID as method (backport #1146) [humble] rosbag2_storage: expose default storage ID as method (backport #1146) Jun 22, 2024
Signed-off-by: Michael Orlov <[email protected]>
@MichaelOrlov
Copy link
Contributor

Pulls: #1724
Gist: https://gist.githubusercontent.com/MichaelOrlov/39b07ce00d026b2aaa4c9c81e5ba06fe/raw/bb4e53fe668a44ccec3fab3b6879fca70c91f335/ros2.repos
BUILD args: --packages-above-and-dependencies ros2bag rosbag2_cpp rosbag2_py rosbag2_storage
TEST args: --packages-above ros2bag rosbag2_cpp rosbag2_py rosbag2_storage
ROS Distro: humble
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/14112

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Linux-rhel Build Status
  • Windows Build Status

@MichaelOrlov MichaelOrlov merged commit 2465d7d into humble Jun 22, 2024
14 checks passed
@mergify mergify bot deleted the mergify/bp/humble/pr-1146 branch June 22, 2024 23:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants