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] Install signal handlers in recorder only inside record method (backport #1464) #1526

Merged
merged 2 commits into from Jan 9, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jan 4, 2024

This is an automatic backport of pull request #1464 done by Mergify.
Cherry-pick of 195e406 has failed:

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

You are currently cherry-picking commit 195e406.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

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

Signed-off-by: Michael Orlov <michael.orlov@apex.ai>
(cherry picked from commit 195e406)

# Conflicts:
#	rosbag2_py/src/rosbag2_py/_transport.cpp
@mergify mergify bot requested a review from a team as a code owner January 4, 2024 07:42
@mergify mergify bot added the conflicts label Jan 4, 2024
@mergify mergify bot requested review from emersonknapp and james-rms and removed request for a team January 4, 2024 07:42
@MichaelOrlov MichaelOrlov changed the title Install signal handlers in recorder only inside record method (backport #1464) [humble] Install signal handlers in recorder only inside record method (backport #1464) Jan 4, 2024
Signed-off-by: Michael Orlov <michael.orlov@apex.ai>
@MichaelOrlov
Copy link
Contributor

Gist: https://gist.githubusercontent.com/MichaelOrlov/ffd4e1e650698d81c8655248e5a3d80e/raw/668a0afe60ac3b01e1302181ce22bb734d1bb4fb/ros2.repos
BUILD args: --packages-above-and-dependencies rosbag2_py
TEST args: --packages-above rosbag2_py
ROS Distro: humble
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/13103

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

Copy link
Contributor

@fujitatomoya fujitatomoya left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@MichaelOrlov thanks for resolving the conflicts. lgtm

@MichaelOrlov MichaelOrlov merged commit a296fb5 into humble Jan 9, 2024
14 checks passed
@delete-merged-branch delete-merged-branch bot deleted the mergify/bp/humble/pr-1464 branch January 9, 2024 03:24
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.

None yet

2 participants