浏览代码

CI automated format fixes (#11179)

* Format all C files for now, till diff logic works within CI

* Fix recursion of dos2unix
Joel Challis 4 年之前
父节点
当前提交
1ebd243cdc
共有 2 个文件被更改,包括 3 次插入3 次删除
  1. 2 2
      .github/workflows/format.yaml
  2. 1 1
      lib/python/qmk/cli/fileformat.py

+ 2 - 2
.github/workflows/format.yaml

@@ -6,7 +6,7 @@ on:
     - master
 
 jobs:
-  generate:
+  format:
     runs-on: ubuntu-latest
     container: qmkfm/base_container
 
@@ -22,7 +22,7 @@ jobs:
 
     - name: Format files
       run: |
-        bin/qmk cformat
+        bin/qmk cformat -a
         bin/qmk pyformat
         bin/qmk fileformat
 

+ 1 - 1
lib/python/qmk/cli/fileformat.py

@@ -9,5 +9,5 @@ import subprocess
 def fileformat(cli):
     """Run several general formatting commands.
     """
-    dos2unix = subprocess.run(['bash', '-c', 'dos2unix **'])
+    dos2unix = subprocess.run(['bash', '-c', 'git ls-files -z | xargs -0 dos2unix'])
     return dos2unix.returncode