Reverted new options in clang-format.

clang-format-18 is not supported by runner and somehow it's too complicated to install it.
powerof3 · Apr 13, 2024 · b357fb3 · b357fb3
1 parent 70afa0c
commit b357fb3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/.github/workflows/maintenance.yml b/.github/workflows/maintenance.yml
@@ -14,7 +14,7 @@ jobs:
         python-version: '3.10'
 
     - name: Run clang-format
-      run: find -type f \( -name *.h -o -name *.cpp \) | xargs clang-format-14 -style=file -i
+      run: find -type f \( -name *.h -o -name *.cpp \) | xargs clang-format-15 -style=file -i
 
     - name: Glob files
       run: python ${{ github.workspace }}/SPID/ProjectGen.py

diff --git a/SPID/.clang-format b/SPID/.clang-format
@@ -11,7 +11,6 @@ AlignTrailingComments: 'true'
 AllowAllArgumentsOnNextLine: 'false'
 AllowAllConstructorInitializersOnNextLine: 'false'
 AllowAllParametersOfDeclarationOnNextLine: 'false'
-RequiresExpressionIndentation: OuterScope
 AllowShortBlocksOnASingleLine: Empty
 AllowShortCaseLabelsOnASingleLine: 'false'
 AllowShortEnumsOnASingleLine: 'true'