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

[Spawner - utils] Improve launch utils to support the multiple controller names (backport #1782) #1784

Merged
merged 1 commit into from
Oct 14, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 9, 2024

This PR aims to add a new method that supports the multiple controller names parsing when generating the launch description


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

@mergify mergify bot added the conflicts label Oct 9, 2024
Copy link
Contributor Author

mergify bot commented Oct 9, 2024

Cherry-pick of 88441b0 has failed:

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

You are currently cherry-picking commit 88441b0.
  (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:   controller_manager/controller_manager/launch_utils.py

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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Copy link
Contributor Author

mergify bot commented Oct 13, 2024

This pull request is in conflict. Could you fix it @bmagyar @destogl @christophfroehlich?

Copy link

codecov bot commented Oct 13, 2024

Codecov Report

Attention: Patch coverage is 0% with 5 lines in your changes missing coverage. Please review.

Project coverage is 62.20%. Comparing base (f5b0976) to head (3a2171e).
Report is 1 commits behind head on iron.

Files with missing lines Patch % Lines
...troller_manager/controller_manager/launch_utils.py 0.00% 5 Missing ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##             iron    #1784   +/-   ##
=======================================
  Coverage   62.20%   62.20%           
=======================================
  Files         112      112           
  Lines       12300    12303    +3     
  Branches     8605     8605           
=======================================
+ Hits         7651     7653    +2     
  Misses        882      882           
- Partials     3767     3768    +1     
Flag Coverage Δ
unittests 62.20% <0.00%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
...troller_manager/controller_manager/launch_utils.py 0.00% <0.00%> (ø)

... and 2 files with indirect coverage changes

@christophfroehlich christophfroehlich merged commit 1fbe5e6 into iron Oct 14, 2024
10 of 11 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/iron/pr-1782 branch October 14, 2024 07:12
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.

2 participants