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

[JTC] Activate checks for parameter validation (backport #857) #873

Merged
merged 3 commits into from
Dec 1, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 30, 2023

This is an automatic backport of pull request #857 done by Mergify.
Cherry-pick of fcc0847 has failed:

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

You are currently cherry-picking commit fcc0847.
  (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.cpp

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

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

(cherry picked from commit fcc0847)

# Conflicts:
#	joint_trajectory_controller/test/test_trajectory_controller_utils.hpp
@mergify mergify bot added the conflicts label Nov 30, 2023
@christophfroehlich
Copy link
Contributor

See #874

* Revert "fix conflict"

This reverts commit c0aaabf.

* Fix merge conflict
Copy link

codecov bot commented Dec 1, 2023

Codecov Report

Merging #873 (0c9e878) into iron (1f93eb1) will increase coverage by 0.60%.
Report is 1 commits behind head on iron.
The diff coverage is n/a.

Additional details and impacted files
@@            Coverage Diff             @@
##             iron     #873      +/-   ##
==========================================
+ Coverage   46.42%   47.03%   +0.60%     
==========================================
  Files          40       40              
  Lines        3655     3655              
  Branches     1728     1728              
==========================================
+ Hits         1697     1719      +22     
+ Misses        772      747      -25     
- Partials     1186     1189       +3     
Flag Coverage Δ
unittests 47.03% <ø> (+0.60%) ⬆️

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

see 3 files with indirect coverage changes

@bmagyar bmagyar merged commit 249a1f5 into iron Dec 1, 2023
12 of 14 checks passed
@bmagyar bmagyar deleted the mergify/bp/iron/pr-857 branch December 1, 2023 10:46
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