Skip to content

Commit afecbfd

Browse files
authored
Merge pull request #140 from hjmjohnson/sync-clang-format
2 parents 13fcd46 + 3903fe1 commit afecbfd

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.clang-format

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@ jobs:
77
runs-on: ubuntu-latest
88

99
steps:
10-
- uses: actions/checkout@v4
11-
with:
12-
fetch-depth: 1
13-
- uses: InsightSoftwareConsortium/ITKClangFormatLinterAction@master
10+
- uses: actions/checkout@v5
11+
12+
- uses: InsightSoftwareConsortium/ITKClangFormatLinterAction@main
1413
with:
15-
itk-branch: master
14+
itk-branch: main

0 commit comments

Comments
 (0)