Skip to content

should pull valid transition before trying to change the state. (backport #2774)#2785

Merged
ahcorde merged 2 commits intohumblefrom
mergify/bp/humble/pr-2774
Mar 31, 2025
Merged

should pull valid transition before trying to change the state. (backport #2774)#2785
ahcorde merged 2 commits intohumblefrom
mergify/bp/humble/pr-2774

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Mar 28, 2025

i think this is just a simple oversight.
rcl_lifecycle_get_transition_by_id should be called to pull out the valid transition based on the current state, aligns with rcl_lifecycle_get_transition_by_label.

Note

backport to humble and jazzy required


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

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

# Conflicts:
#	rclcpp_lifecycle/src/lifecycle_node_interface_impl.cpp
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Mar 28, 2025

Cherry-pick of 7b6ee8a has failed:

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

You are currently cherry-picking commit 7b6ee8a.
  (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_lifecycle/test/test_lifecycle_node.cpp

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   rclcpp_lifecycle/src/lifecycle_node_interface_impl.cpp

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

Copy link
Copy Markdown
Contributor

@ahcorde ahcorde left a comment

Choose a reason for hiding this comment

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

Do you mind to take a look @fujitatomoya ?

@fujitatomoya
Copy link
Copy Markdown
Collaborator

@ahcorde @jmachowinski thanks, i will take a look at this conflict.

Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
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.

code base is different, rclcpp_lifecycle/src/lifecycle_node_interface_impl.cpp does not exist in humble.

local testing succeed without any error.

@fujitatomoya
Copy link
Copy Markdown
Collaborator

Pulls: #2785
Gist: https://gist.githubusercontent.com/fujitatomoya/555ddd164a399dfec58292e0b8e45a7a/raw/f1219489fcf5ad894bde7ffab224b6f78d0fe0c6/ros2.repos
BUILD args: --packages-above-and-dependencies rclcpp_lifecycle
TEST args: --packages-above rclcpp_lifecycle
ROS Distro: humble
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/15517

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

@ahcorde ahcorde merged commit c751dfb into humble Mar 31, 2025
2 checks passed
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.

2 participants