From 371a500145f0041f89634332f56d89e5bcd6d96a Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue, 26 Mar 2024 08:58:06 +0000
Subject: [PATCH 1/2] Add cm as dependency to rqt_cm (#1447) (#1459)
---
rqt_controller_manager/package.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/rqt_controller_manager/package.xml b/rqt_controller_manager/package.xml
index 1c612ba056..a0d5754305 100644
--- a/rqt_controller_manager/package.xml
+++ b/rqt_controller_manager/package.xml
@@ -18,6 +18,7 @@
Kelsey Hawkins
Adolfo RodrÃguez Tsouroukdissian
+ controller_manager
controller_manager_msgs
rclpy
rqt_gui
From d470ce9d9b324a1785c5e7732e26609cd98dccae Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue, 26 Mar 2024 14:23:40 +0100
Subject: [PATCH 2/2] Bump version of pre-commit hooks (backport #1456) (#1461)
* Bump version of pre-commit hooks (#1456)
(cherry picked from commit 99d7128af013d16bb1ea536d52de7892154bb7db)
# Conflicts:
# .pre-commit-config.yaml
* Update .pre-commit-config.yaml
---------
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Dr. Denis
---
.pre-commit-config.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index dc3b3e837d..3544ac3af2 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -62,7 +62,7 @@ repos:
# CPP hooks
- repo: https://github.com/pre-commit/mirrors-clang-format
- rev: v18.1.0
+ rev: v18.1.2
hooks:
- id: clang-format
args: ['-fallback-style=none', '-i']