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

Cleanup package.xml und clarify tests of JTC. (backport #889) #924

Merged
merged 5 commits into from
Jan 12, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 12, 2023

This is an automatic backport of pull request #889 done by Mergify.
Cherry-pick of 1d0d753 has failed:

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

You are currently cherry-picking commit 1d0d753.
  (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:   joint_trajectory_controller/test/test_trajectory_controller_utils.hpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   joint_trajectory_controller/package.xml

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

@mergify mergify bot added the conflicts label Dec 12, 2023
@christophfroehlich
Copy link
Contributor

Merge conflicts, backport #926 before?

@bmagyar
Copy link
Member

bmagyar commented Dec 12, 2023

I don't think #926 applies to humble. Fixed the conflicts (I think)

@christophfroehlich
Copy link
Contributor

I don't think #926 applies to humble. Fixed the conflicts (I think)

The title of 926 is "wrong", because the parameter validation got already backported with a different one. but the dependencies are missing on humble!

@christophfroehlich
Copy link
Contributor

You have added them now with this backport (which is fine, with 926 rsl and tl_expected will also be explicitly given in the CMakeLists)

Copy link

codecov bot commented Dec 21, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (91815a4) 44.81% compared to head (d0f4e84) 44.84%.
Report is 23 commits behind head on humble.

❗ Current head d0f4e84 differs from pull request most recent head d0c1445. Consider uploading reports for the commit d0c1445 to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##           humble     #924      +/-   ##
==========================================
+ Coverage   44.81%   44.84%   +0.02%     
==========================================
  Files          40       40              
  Lines        3713     3713              
  Branches     1769     1769              
==========================================
+ Hits         1664     1665       +1     
  Misses        835      835              
+ Partials     1214     1213       -1     
Flag Coverage Δ
unittests 44.84% <ø> (+0.02%) ⬆️

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

see 1 file with indirect coverage changes

destogl and others added 2 commits December 22, 2023 12:52
* Cleanup package.xml und clarify tests of JTC.

* Update joint_trajectory_controller/package.xml

Co-authored-by: Bence Magyar <[email protected]>

---------

Co-authored-by: Bence Magyar <[email protected]>
(cherry picked from commit 1d0d753)

# Conflicts:
#	joint_trajectory_controller/package.xml
Copy link
Contributor

@christophfroehlich christophfroehlich left a comment

Choose a reason for hiding this comment

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

See commit above regarding backport of 926

Copy link
Contributor Author

mergify bot commented Jan 12, 2024

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

@bmagyar bmagyar merged commit e08dcb9 into humble Jan 12, 2024
12 of 13 checks passed
@bmagyar bmagyar deleted the mergify/bp/humble/pr-889 branch January 12, 2024 11:55
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.

3 participants