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) #1415

Merged
merged 5 commits into from
Feb 28, 2024
Merged

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/iron/pr-1413
Your branch is up to date with 'origin/iron'.

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:
	deleted:    .github/workflows/ci-format.yml
	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-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
Copy link
Contributor Author

mergify bot commented Feb 27, 2024

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

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

destogl commented Feb 28, 2024

@bmagyar Since you already approved this, I assume you want to keep the pre-commit and formatting changes together. This is fine with me too in this case.

Therefore merging!

@destogl destogl merged commit 743e065 into iron Feb 28, 2024
11 checks passed
@destogl destogl deleted the mergify/bp/iron/pr-1413 branch February 28, 2024 17:07
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.

3 participants