fixup

Author: deniskoronchik

scripts/ci/check-formatting.sh

@@ -2,8 +2,8 @@
 
 set -eo pipefail
 
-sudo apt-get update
-sudo apt-get install -y clang-format
+# sudo apt-get update
+# sudo apt-get install -y clang-format
 
 python3 scripts/tools/format-code.py --check \
 sc-kpm \

scripts/tools/format-code.py

@@ -72,26 +72,32 @@ def check(self, search_paths) -> bool:
     non_formatted_files = []
 
     for f in files:
-      print('Check {}'.format(f))
+      print('Check {}'.format(f), end='')
       cmd = "{} --output-replacements-xml {}".format(Formatter.Executable, f)
 
       process = subprocess.Popen(cmd, shell=True, cwd=os.getcwd(), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
       rc = process.wait()
       output = process.communicate()[0]
 
-      if rc != 0:
-        final_result = False
-        continue
+      passed = False
 
-      # check if there are any replacements
-      s = output.decode("utf-8")
-      if len(s) > 0:
-        root = ET.fromstring(s)
-        replacements = root.findall("replacement")
+      if rc == 0:
+
+        passed = True
+        # check if there are any replacements
+        s = output.decode("utf-8")
+        if len(s) > 0:
+          root = ET.fromstring(s)
+          replacements = root.findall("replacement")
+
+          if len(replacements) > 0:
+            passed = False
+      
+      if not passed:
+        final_result = False
+        non_formatted_files.append(f)
 
-        if len(replacements) > 0:
-          final_result = False
-          non_formatted_files.append(f)
+      print (" - {}".format("ok" if passed else "fail"))
 
     return (final_result, non_formatted_files)
 
@@ -112,12 +118,16 @@ def check(self, search_paths) -> bool:
   c = Formatter()
   if args.check:
     passed, files = c.check(args.files)
-    if not passed or len(files) > 0:
+    if not passed:
       if len(files) > 0:
+        print ("-" * 10)
         print("Files that need formatting:")
         for f in files:
           print(" {}".format(f))
+    else:
+      print ("-" * 10)
+      print ("All checks passed")
 
-      sys.exit(0 if passed else 1)
+    sys.exit(0 if passed else 1)
   else:
     c.format(args.files)