Skip to content

apply actual QoS from rmw to the IPC publisher. (backport #2707)#2711

Merged
fujitatomoya merged 3 commits intohumblefrom
mergify/bp/humble/pr-2707
Dec 17, 2024
Merged

apply actual QoS from rmw to the IPC publisher. (backport #2707)#2711
fujitatomoya merged 3 commits intohumblefrom
mergify/bp/humble/pr-2707

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Dec 16, 2024

closes #2705

note: backport required to jazzy and humble.

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

@fujitatomoya @mergify
apply actual QoS from rmw to the IPC publisher. (#2707)
7060508 
* apply actual QoS from rmw to the IPC publisher.

Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>

* address uncrustify warning.

Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>

---------

Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
(cherry picked from commit 016cfea)

# Conflicts:
#	rclcpp/include/rclcpp/publisher.hpp
@mergify mergify bot added the conflicts label Dec 16, 2024
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Dec 16, 2024

Cherry-pick of 016cfea has failed:

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

You are currently cherry-picking commit 016cfea.
  (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:   rclcpp/test/rclcpp/test_create_subscription.cpp
	modified:   rclcpp/test/rclcpp/test_publisher.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   rclcpp/include/rclcpp/publisher.hpp

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 mentioned this pull request Dec 16, 2024
Merged
@fujitatomoya
Copy link
Copy Markdown
Collaborator

fujitatomoya commented Dec 16, 2024

unfortunately there is an conflict, i will try to address this tomorrow.

@fujitatomoya
resolve conflicts for backport humble.
5e4dd1a 
Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
fujitatomoya
fujitatomoya approved these changes Dec 16, 2024
View reviewed changes
Copy link
Copy Markdown
Collaborator

@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.

backport conflict has been addressed, should be fine now.

@fujitatomoya
Copy link
Copy Markdown
Collaborator

fujitatomoya commented Dec 16, 2024

Pulls: #2711
Gist: https://gist.githubusercontent.com/fujitatomoya/6441c9d2b8f7aa140cb7c61f8da745e5/raw/50ae61a2888ec3e03ea8ddf7069ac9ec7f1b8931/ros2.repos
BUILD args: --packages-above-and-dependencies rclcpp
TEST args: --packages-above rclcpp
ROS Distro: humble
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/14968

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

@fujitatomoya
address uncrustify failure.
ba43f04 
Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
@fujitatomoya
Copy link
Copy Markdown
Collaborator

fujitatomoya commented Dec 17, 2024

Pulls: #2711
Gist: https://gist.githubusercontent.com/fujitatomoya/25ec36bf16497b81ed60429d6b9c0777/raw/50ae61a2888ec3e03ea8ddf7069ac9ec7f1b8931/ros2.repos
BUILD args: --packages-up-to rclcpp
TEST args: --packages-select rclcpp
ROS Distro: humble
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/14969

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

@fujitatomoya fujitatomoya merged commit 99f1d8d into humble Dec 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@fujitatomoya fujitatomoya fujitatomoya approved these changes

Assignees

No one assigned

Labels

conflicts

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@fujitatomoya