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

Update pre-commit configuration (backport #28) #30

Merged
merged 2 commits into from
Aug 15, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Aug 15, 2024

Changes Made

This PR adds the following changes:

  1. Updates the .pre-commit-config.yaml file to include gersemi for CMakeLists.txt formatting
  2. Sets main to ROS 2 Rolling
  3. Fixes old syntax issue in Dockerfile

This will currently break the Gazebo installation, but allows me to backport to Jazzy and get set up for Humble and Iron.


This is an automatic backport of pull request #28 done by [Mergify](https://mergify.com).

* Replaced clang-format executable with hook

* added recent formatting changes

(cherry picked from commit d48bcbd)

# Conflicts:
#	.devcontainer/nouveau/Dockerfile
#	.devcontainer/nvidia/Dockerfile
#	.docker/Dockerfile
#	.github/workflows/ci.yml
#	.github/workflows/docker.yml
#	.pre-commit-config.yaml
#	.vscode/c_cpp_properties.json
#	.vscode/settings.json
Copy link
Author

mergify bot commented Aug 15, 2024

Cherry-pick of d48bcbd has failed:

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

You are currently cherry-picking commit d48bcbd.
  (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:   .devcontainer/nouveau/devcontainer.json
	modified:   .devcontainer/nvidia/devcontainer.json
	modified:   example_pkg/CMakeLists.txt

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .devcontainer/nouveau/Dockerfile
	both modified:   .devcontainer/nvidia/Dockerfile
	both modified:   .docker/Dockerfile
	both modified:   .github/workflows/ci.yml
	both modified:   .github/workflows/docker.yml
	both modified:   .pre-commit-config.yaml
	both modified:   .vscode/c_cpp_properties.json
	both modified:   .vscode/settings.json

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 Aug 15, 2024
@mergify mergify bot mentioned this pull request Aug 15, 2024
@evan-palmer evan-palmer merged commit e56e7c3 into humble Aug 15, 2024
7 checks passed
@evan-palmer evan-palmer deleted the mergify/bp/humble/pr-28 branch August 15, 2024 18:27
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.

1 participant