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] Bugfix for parameters not passing to recorder's node from child component (backport #1360) #1368

Merged
merged 2 commits into from Jun 3, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 3, 2023

This is an automatic backport of pull request #1360 done by Mergify.
Cherry-pick of 13f5151 has failed:

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

You are currently cherry-picking commit 13f5151.
  (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_transport/CMakeLists.txt
	new file:   rosbag2_transport/test/rosbag2_transport/test_composable_recorder.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   rosbag2_transport/src/rosbag2_transport/recorder.cpp

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

…ponent (#1360)

* Update recorder.cpp

Signed-off-by: Patrick Roncagliolo <ronca.pat@gmail.com>

* Typo

Signed-off-by: Patrick Roncagliolo <ronca.pat@gmail.com>

* Regression test

Signed-off-by: Patrick Roncagliolo <ronca.pat@gmail.com>

* Fix test for composable recorder with parameter override option

Signed-off-by: Michael Orlov <michael.orlov@apex.ai>

---------

Signed-off-by: Patrick Roncagliolo <ronca.pat@gmail.com>
Signed-off-by: Michael Orlov <michael.orlov@apex.ai>
Co-authored-by: Michael Orlov <michael.orlov@apex.ai>
(cherry picked from commit 13f5151)

# Conflicts:
#	rosbag2_transport/src/rosbag2_transport/recorder.cpp
@mergify mergify bot requested a review from a team as a code owner June 3, 2023 16:09
@mergify mergify bot requested review from MichaelOrlov and james-rms and removed request for a team June 3, 2023 16:09
@mergify mergify bot added the conflicts label Jun 3, 2023
@MichaelOrlov MichaelOrlov changed the title [bugfix] for parameters not passing to recorder's node from child component (backport #1360) [Humble] Bugfix for parameters not passing to recorder's node from child component (backport #1360) Jun 3, 2023
Signed-off-by: Michael Orlov <michael.orlov@apex.ai>
@MichaelOrlov
Copy link
Contributor

Gist: https://gist.githubusercontent.com/MichaelOrlov/48ab6ce7f9f69c91a534393f74e2c095/raw/9728c0665970b2e8293f7f8e2983bd26b40ddfa5/ros2.repos
BUILD args: --packages-above-and-dependencies rosbag2_transport
TEST args: --packages-above rosbag2_transport
ROS Distro: humble
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/12151

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

@MichaelOrlov MichaelOrlov merged commit 9ab822a into humble Jun 3, 2023
14 checks passed
@delete-merged-branch delete-merged-branch bot deleted the mergify/bp/humble/pr-1360 branch June 3, 2023 20:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants