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

Use launch_utils instead of a spawner per controller (backport #666) #667

Merged
merged 2 commits into from
Dec 16, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 16, 2024

Adressing #640, maybe this fixes the flakyness.


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

Copy link
Contributor Author

mergify bot commented Dec 16, 2024

Cherry-pick of ceed8cf has failed:

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

You are currently cherry-picking commit ceed8cf.
  (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:   example_13/CMakeLists.txt
	modified:   example_13/package.xml
	modified:   example_13/test/test_three_robots_launch.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   example_13/bringup/launch/three_robots.launch.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 added the conflicts label Dec 16, 2024
@christophfroehlich christophfroehlich merged commit fc9898f into humble Dec 16, 2024
5 of 6 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/humble/pr-666 branch December 16, 2024 21:13
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.

1 participant