Reverting to the baseline clang-format (#547)

robosoft-ai · Jun 28, 2024 · 4c0b961 · 4c0b961
1 parent 5eb5e2f
commit 4c0b961
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/ci-format.yml b/.github/workflows/ci-format.yml
@@ -17,10 +17,10 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Install clang-format-12
+    - name: Install clang-format
       run: |
        apt update
-       apt install -y python3-pip clang-format-12 ros-humble-ament-cppcheck
+       apt install -y python3-pip clang-format ros-humble-ament-cppcheck
        git config --global --add safe.directory `pwd`
        pip install pre-commit
     - name: pre-commit

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -63,7 +63,7 @@ repos:
       - id: clang-format
         name: clang-format
         description: Format files with ClangFormat.
-        entry: clang-format-12
+        entry: clang-format
         language: system
         files: \.(c|cc|cxx|cpp|frag|glsl|h|hpp|hxx|ih|ispc|ipp|java|js|m|proto|vert)$
         args: ['-fallback-style=none', '-i']