Skip to content

Commit

Permalink
Fixed formatting ci errors
Browse files Browse the repository at this point in the history
  • Loading branch information
evan-palmer committed Jan 9, 2024
1 parent a090901 commit 2b416c9
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ BraceWrapping:
AfterNamespace: true
AfterStruct: true
AfterUnion: true
BeforeCatch: true
BeforeCatch: true
2 changes: 1 addition & 1 deletion .docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -132,4 +132,4 @@ RUN sudo apt-get update \
# Env vars for the nvidia-container-runtime.
ENV NVIDIA_VISIBLE_DEVICES all
ENV NVIDIA_DRIVER_CAPABILITIES graphics,utility,compute
ENV QT_X11_NO_MITSHM 1
ENV QT_X11_NO_MITSHM 1
3 changes: 3 additions & 0 deletions .github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ jobs:
with:
python-version: "3.10"

- name: Install clang-format-14
run: sudo apt-get install clang-format-14

- name: Run pre-commit
uses: pre-commit/[email protected]
id: precommit
Expand Down
22 changes: 6 additions & 16 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,15 @@ repos:
- id: codespell
args: ["--write-changes"]

- repo: https://github.com/pre-commit/mirrors-clang-format
rev: v15.0.6
hooks:
- id: clang-format

- repo: local
hooks:
- id: ament_lint_cmake
name: ament_lint_cmake
entry: ament_lint_cmake
language: system
files: CMakeLists\.txt$

- repo: local
hooks:
- id: ament_copyright
name: ament_copyright
entry: ament_copyright
- id: clang-format
name: clang-format
description: Format files with ClangFormat.
entry: clang-format-14
language: system
files: \.(c|cc|cxx|cpp|frag|glsl|h|hpp|hxx|ih|ispc|ipp|java|js|m|proto|vert)$
args: ['-fallback-style=Google', '-i']

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
Expand Down
2 changes: 1 addition & 1 deletion .ruff.toml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
target-version = "py310"
target-version = "py310"
4 changes: 2 additions & 2 deletions ros2.repos
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Add external repositories that your project depends on here. For example,
# repositories:
#
#
# ros_gz:
# type: git
# url: https://github.com/gazebosim/ros_gz
# version: ros2
# version: ros2
2 changes: 1 addition & 1 deletion template_pkg/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@
<export>
<build_type>ament_cmake</build_type>
</export>
</package>
</package>

0 comments on commit 2b416c9

Please sign in to comment.