From 4c0b961431da4cbb4f3e0408a80f98fe5d6fdb0e Mon Sep 17 00:00:00 2001
From: Jaycee Lock <5284743+yassiezar@users.noreply.github.com>
Date: Fri, 28 Jun 2024 16:51:53 +0100
Subject: [PATCH] Reverting to the baseline clang-format (#547)

---
 .github/workflows/ci-format.yml | 4 ++--
 .pre-commit-config.yaml         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci-format.yml b/.github/workflows/ci-format.yml
index da31e1cb8..c6e45f19d 100644
--- 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
index 31c6e1b5f..cb0b072df 100644
--- 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']