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

🔧 use pre-commit workflow from ros2_control_ci (backport #458) #459

Merged
merged 1 commit into from
Mar 7, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 7, 2024

This is an automatic backport of pull request #458 done by Mergify.
Cherry-pick of 7dc41df has failed:

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

You are currently cherry-picking commit 7dc41df.
  (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-pre-commit.yml
	new file:   .github/workflows/iron-pre-commit.yml
	new file:   .github/workflows/rolling-pre-commit.yml
	new file:   .github/workflows/update-pre-commit.yml
	modified:   .pre-commit-config.yaml
	modified:   CONTRIBUTING.md

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by them: .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

Copy link
Contributor Author

mergify bot commented Mar 7, 2024

Cherry-pick of 7dc41df has failed:

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

You are currently cherry-picking commit 7dc41df.
  (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-pre-commit.yml
	new file:   .github/workflows/iron-pre-commit.yml
	new file:   .github/workflows/rolling-pre-commit.yml
	new file:   .github/workflows/update-pre-commit.yml
	modified:   .pre-commit-config.yaml
	modified:   CONTRIBUTING.md

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by them: .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 mergify bot added the conflicts label Mar 7, 2024
* Use new pre-commit wf from ros2_control_ci

* Update pre-commit config

* Fix license text in contributing.md

* Add update-pre-commit
@christophfroehlich christophfroehlich merged commit 8e182fd into humble Mar 7, 2024
7 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/humble/pr-458 branch March 7, 2024 12:16
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