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] Use a single list for lint job (backport #451) #453

Merged
merged 2 commits into from
Feb 18, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 18, 2024

This is an automatic backport of pull request #451 done by Mergify.
Cherry-pick of 044db05 has failed:

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

You are currently cherry-picking commit 044db05.
  (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:   example_11/doc/userdoc.rst
	modified:   example_11/hardware/include/ros2_control_demo_example_11/carlikebot_system.hpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/ci-ros-lint.yml

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

* Use a single list for lint job

* Add explicit keyword

* Update broken links

(cherry picked from commit 044db05)

# Conflicts:
#	.github/workflows/ci-ros-lint.yml
@christophfroehlich christophfroehlich merged commit 4543658 into humble Feb 18, 2024
11 checks passed
@mergify mergify bot deleted the mergify/bp/humble/pr-451 branch February 18, 2024 14:32
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.

1 participant