Skip to content

Commit 71edfdf

Browse files
committed
COMP: Fix clang-format rules for CI.
1 parent 209a987 commit 71edfdf

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

.clang-format

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## This config file is only relevant for clang-format version 19.1.4
1+
## This config file is only relevant for clang-format version 19.1.7
22
##
33
## Examples of each format style can be found on the in the clang-format documentation
44
## See: https://clang.llvm.org/docs/ClangFormatStyleOptions.html for details of each option
@@ -10,11 +10,11 @@
1010
## maintaining a consistent code style.
1111
##
1212
## EXAMPLE apply code style enforcement before commit:
13-
# Utilities/Maintenance/clang-format.bash --clang ${PATH_TO_CLANG_FORMAT_19.1.4} --modified
13+
# Utilities/Maintenance/clang-format.bash --clang ${PATH_TO_CLANG_FORMAT_19.1.7} --modified
1414
## EXAMPLE apply code style enforcement after commit:
15-
# Utilities/Maintenance/clang-format.bash --clang ${PATH_TO_CLANG_FORMAT_19.1.4} --last
15+
# Utilities/Maintenance/clang-format.bash --clang ${PATH_TO_CLANG_FORMAT_19.1.7} --last
1616
---
17-
# This configuration requires clang-format version 19.1.4 exactly.
17+
# This configuration requires clang-format version 19.1.7 exactly.
1818
Language: Cpp
1919
AccessModifierOffset: -2
2020
AlignAfterOpenBracket: Align
@@ -297,6 +297,7 @@ StatementMacros:
297297
- ITK_CLANG_PRAGMA_PUSH
298298
- ITK_CLANG_PRAGMA_POP
299299
- ITK_CLANG_SUPPRESS_Wzero_as_null_pointer_constant
300+
- ITK_CLANG_SUPPRESS_Wduplicate_enum
300301
- CLANG_PRAGMA_PUSH
301302
- CLANG_PRAGMA_POP
302303
- CLANG_SUPPRESS_Wfloat_equal

.github/workflows/clang-format-linter.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ jobs:
77
runs-on: ubuntu-latest
88

99
steps:
10-
- uses: actions/checkout@v4
10+
- uses: actions/checkout@v5
1111
with:
1212
fetch-depth: 1
13-
- uses: InsightSoftwareConsortium/ITKClangFormatLinterAction@master
13+
- uses: InsightSoftwareConsortium/ITKClangFormatLinterAction@main
1414
with:
1515
itk-branch: master

0 commit comments

Comments
 (0)