fixup! fixup! fixup! fixup! fixup! fixup! ci: make clang-format check mandatory in CI

Author: VJanKraemer

SilKit/ci/check_formatting.py

@@ -83,8 +83,6 @@ def main():
         '--repo', help="The Github repo to be reformatted", type=str)
     parser.add_argument(
         '--dryrun', help="Only produce warnings", action='store_true')
-    parser.add_argument(
-        '--werror', help="Treat clang-format warnings as errors", action='store_true')
     args = parser.parse_args()
 
     # Check for supported clang-format version
@@ -121,15 +119,19 @@ def main():
             for ext in fileExtensions:
                 files = files + (sorted(rootPath.rglob(ext)))
 
-    dryrun = ''
+    clang_format_cmd = [CLANG_FORMAT]
     if args.dryrun:
-        dryrun = "--dry-run"
+        clang_format_cmd.append('--Werror')
+        clang_format_cmd.append('--dry-run')
+
+    clang_format_cmd = clang_format_cmd + ['-i', '--style=file']
+    print(clang_format_cmd)
     for file in files:
 
         if any(p in file for p in dirs):
 
             totalFiles = totalFiles + 1
-            formatResult = subprocess.run([CLANG_FORMAT, '--Werror', dryrun, '-i', '--style=file', file], capture_output=True, encoding='utf-8')
+            formatResult = subprocess.run(clang_format_cmd + [file], capture_output=True, encoding='utf-8')
             if formatResult.returncode != 0:
                 formattingCorrect = False
                 totalWarnings = totalWarnings + 1
@@ -142,7 +144,7 @@ def main():
         # Only warn for now
         warn("Formatting for one or more SilKit source code files not correct.!")
         warn("Please format your source code properly using the SilKit .clang-format config file!")
-        ret_code = 64 if args.werror else 0
+        ret_code = 64 if args.dryrun else 0
         exit(ret_code)
 
     info("All source code files properly formatted!")