From ba1b71526ca52df596d16bb4d560db7146165978 Mon Sep 17 00:00:00 2001 From: Eduardo Almeida Date: Thu, 31 Oct 2024 15:33:39 +0000 Subject: [PATCH] check-style, ci, doc: Raise minimum clang-format version to 15 --- doc/contributing/source/coding-style.rst | 1 - utils/check-style-clang-format.py | 2 +- utils/tests/gitlab-ci-code-linting.yml | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/doc/contributing/source/coding-style.rst b/doc/contributing/source/coding-style.rst index c2bfd7b07..50753e928 100644 --- a/doc/contributing/source/coding-style.rst +++ b/doc/contributing/source/coding-style.rst @@ -46,7 +46,6 @@ to produce consistent output among themselves. * clang-format-17 * clang-format-16 * clang-format-15 -* clang-format-14 Integration with IDEs ===================== diff --git a/utils/check-style-clang-format.py b/utils/check-style-clang-format.py index 0383d0fa7..616e8805e 100755 --- a/utils/check-style-clang-format.py +++ b/utils/check-style-clang-format.py @@ -41,7 +41,7 @@ from typing import Callable, Dict, List, Tuple # PARAMETERS ########################################################### CLANG_FORMAT_MAX_VERSION = 17 -CLANG_FORMAT_MIN_VERSION = 14 +CLANG_FORMAT_MIN_VERSION = 15 FORMAT_GUARD_ON = [ "// clang-format on", diff --git a/utils/tests/gitlab-ci-code-linting.yml b/utils/tests/gitlab-ci-code-linting.yml index 7efd285dc..60fb20a03 100644 --- a/utils/tests/gitlab-ci-code-linting.yml +++ b/utils/tests/gitlab-ci-code-linting.yml @@ -21,10 +21,10 @@ check-style-clang-format-17: variables: CLANG_FORMAT_VERSION: 17 -check-style-clang-format-14: +check-style-clang-format-15: extends: .check-style-clang-format variables: - CLANG_FORMAT_VERSION: 14 + CLANG_FORMAT_VERSION: 15 # Clang-tidy clang-tidy-18: