From ee6e559a67d954d170c5f2576c7dad997e196818 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 7 Oct 2024 08:14:04 +0200
Subject: [PATCH 1/2] Auto-update pre-commit hooks (#1118)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
(cherry picked from commit 496d92409ecc6e59afeb41e251f089e9a2c8fd6f)

# Conflicts:
#	.pre-commit-config.yaml
---
 .pre-commit-config.yaml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 72f0efc09..63e6b1aef 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -15,7 +15,11 @@
 repos:
   # Standard hooks
   - repo: https://github.com/pre-commit/pre-commit-hooks
+<<<<<<< HEAD
     rev: v3.4.0
+=======
+    rev: v5.0.0
+>>>>>>> 496d924 (Auto-update pre-commit hooks (#1118))
     hooks:
       - id: check-added-large-files
       - id: check-ast
@@ -69,7 +73,7 @@ repos:
       - id: ament_cppcheck
         name: ament_cppcheck
         description: Static code analysis of C/C++ files.
-        stages: [commit]
+        stages: [pre-commit]
         entry: env AMENT_CPPCHECK_ALLOW_SLOW_VERSIONS=1 ament_cppcheck
         language: system
         files: \.(h\+\+|h|hh|hxx|hpp|cuh|c|cc|cpp|cu|c\+\+|cxx|tpp|txx)$
@@ -80,7 +84,7 @@ repos:
       - id: ament_cpplint
         name: ament_cpplint
         description: Static code analysis of C/C++ files.
-        stages: [commit]
+        stages: [pre-commit]
         entry: ament_cpplint
         language: system
         files: \.(h\+\+|h|hh|hxx|hpp|cuh|c|cc|cpp|cu|c\+\+|cxx|tpp|txx)$
@@ -102,7 +106,7 @@ repos:
       - id: ament_lint_cmake
         name: ament_lint_cmake
         description: Check format of CMakeLists.txt files.
-        stages: [commit]
+        stages: [pre-commit]
         entry: ament_lint_cmake
         language: system
         files: CMakeLists.txt$
@@ -113,7 +117,7 @@ repos:
       - id: ament_copyright
         name: ament_copyright
         description: Check if copyright notice is available in all files.
-        stages: [commit]
+        stages: [pre-commit]
         entry: ament_copyright
         language: system
         args: ['--exclude', 'ur_robot_driver/doc/conf.py', 'ur_calibration/doc/conf.py']

From 74a92b1d69ddf0c331bae0a9dacd16797656110c Mon Sep 17 00:00:00 2001
From: "Felix Exner (fexner)" <exner@fzi.de>
Date: Mon, 7 Oct 2024 08:25:08 +0200
Subject: [PATCH 2/2] Update .pre-commit-config.yaml

---
 .pre-commit-config.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 63e6b1aef..cc6a89647 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -15,11 +15,7 @@
 repos:
   # Standard hooks
   - repo: https://github.com/pre-commit/pre-commit-hooks
-<<<<<<< HEAD
-    rev: v3.4.0
-=======
     rev: v5.0.0
->>>>>>> 496d924 (Auto-update pre-commit hooks (#1118))
     hooks:
       - id: check-added-large-files
       - id: check-ast