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

[CI] Code coverage + pre-commit (backport #1413) #1414

Merged
merged 6 commits into from Mar 1, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 25, 2024

This is an automatic backport of pull request #1413 done by Mergify.
Cherry-pick of 1538c91 has failed:

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

You are currently cherry-picking commit 1538c91.
  (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:
	new file:   .github/workflows/humble-coverage-build.yml
	new file:   .github/workflows/humble-pre-commit.yml
	new file:   .github/workflows/iron-coverage-build.yml
	new file:   .github/workflows/iron-pre-commit.yml
	new file:   .github/workflows/rolling-coverage-build.yml
	new file:   .github/workflows/rolling-pre-commit.yml
	new file:   .github/workflows/update-pre-commit.yml
	modified:   CONTRIBUTING.md
	modified:   controller_manager/src/controller_manager.cpp
	modified:   controller_manager/test/controller_manager_test_common.hpp
	modified:   hardware_interface/test/test_handle.cpp
	modified:   rqt_controller_manager/setup.py

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by them: .github/workflows/ci-coverage-build.yml
	deleted by them: .github/workflows/ci-format.yml
	deleted by them: .github/workflows/ci-ros-lint.yml
	both modified:   .pre-commit-config.yaml

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 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 Feb 25, 2024
@bmagyar
Copy link
Member

bmagyar commented Feb 27, 2024

too much content?

@christophfroehlich
Copy link
Contributor

christophfroehlich commented Feb 27, 2024

too much content?

#936 was not backported, now pre-commit fails. or should we just not add black to the config for humble?

destogl
destogl previously approved these changes Feb 28, 2024
@destogl
Copy link
Member

destogl commented Feb 28, 2024

This is good and I would merge it :)

@bmagyar alternatively, we can split the CI / pre-comit config update and file formatting update. Would you prefer that more?

Copy link
Contributor Author

mergify bot commented Mar 1, 2024

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

Copy link

codecov bot commented Mar 1, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 75.76%. Comparing base (6608dbc) to head (28e8f4f).
Report is 15 commits behind head on humble.

Additional details and impacted files
@@             Coverage Diff             @@
##           humble    #1414       +/-   ##
===========================================
+ Coverage   31.03%   75.76%   +44.73%     
===========================================
  Files          95       41       -54     
  Lines       10729     3219     -7510     
  Branches     7421     1834     -5587     
===========================================
- Hits         3330     2439      -891     
+ Misses        723      416      -307     
+ Partials     6676      364     -6312     
Flag Coverage Δ
unittests 75.76% <ø> (+44.73%) ⬆️

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

Files Coverage Δ
controller_manager/src/controller_manager.cpp 64.77% <ø> (+27.88%) ⬆️
...e_interface/src/mock_components/generic_system.cpp 80.39% <ø> (+26.62%) ⬆️

... and 83 files with indirect coverage changes

@bmagyar bmagyar merged commit 0aa7ce7 into humble Mar 1, 2024
10 of 11 checks passed
@mergify mergify bot deleted the mergify/bp/humble/pr-1413 branch March 1, 2024 11:41
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.

None yet

3 participants