From 6367ae5103a43d98ec0cb340efb9c2c27f98ebc7 Mon Sep 17 00:00:00 2001
From: Miguel Prada <miguel.prada.sarasola@gmail.com>
Date: Thu, 1 Feb 2024 11:02:13 +0100
Subject: [PATCH] Update to a more recent version of clang-format in related
job
---
ci-templates/syntax-check.yml | 4 ++--
clang-format | 5 ++---
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/ci-templates/syntax-check.yml b/ci-templates/syntax-check.yml
index b0608b0..ee11e3b 100644
--- a/ci-templates/syntax-check.yml
+++ b/ci-templates/syntax-check.yml
@@ -15,9 +15,9 @@ clang_format:
- wget https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/${GITLAB_TEMPLATES_BRANCH}/clang-format -O .clang-format
script: .ci_config/gitlab.sh
variables:
- ROS_DISTRO: kinetic
+ ROS_DISTRO: noetic
CLANG_FORMAT_CHECK: file
- CLANG_FORMAT_VERSION: "3.8"
+ CLANG_FORMAT_VERSION: 10
when: always
##########################################################
diff --git a/clang-format b/clang-format
index ebcd8ad..cd1c017 100644
--- a/clang-format
+++ b/clang-format
@@ -1,5 +1,5 @@
---
-# Format file from: https://github.com/davetcoleman/roscpp_code_format (bfa4ea78b4ac856da07458c8824bf5eb327ea693)
+# Format file from: https://github.com/PickNikRobotics/roscpp_code_format (75a84b075d648828b7aa64094699e5ab5cc7adb7)
BasedOnStyle: Google
AccessModifierOffset: -2
ConstructorInitializerIndentWidth: 2
@@ -9,9 +9,8 @@ AllowAllParametersOfDeclarationOnNextLine: false
AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: false
AllowShortFunctionsOnASingleLine: None
-AllowShortLoopsOnASingleLine: false
AlwaysBreakTemplateDeclarations: true
-AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakBeforeMultilineStrings: true
BreakBeforeBinaryOperators: false
BreakBeforeTernaryOperators: false
BreakConstructorInitializersBeforeComma: true
--
GitLab