diff options
author | Joel Challis <git@zvecr.com> | 2020-12-11 13:49:03 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-11 13:49:03 +0000 |
commit | 1ebd243cdc759e68205787af7d6517d89632876a (patch) | |
tree | 2d54ffa0f9f979b0af9e1fcb3e5fdbc511c70ee9 | |
parent | b1858167177a60c16e0e8022b7a2f5ee0eb03c24 (diff) | |
download | qmk_firmware-1ebd243cdc759e68205787af7d6517d89632876a.tar.gz qmk_firmware-1ebd243cdc759e68205787af7d6517d89632876a.zip |
CI automated format fixes (#11179)
* Format all C files for now, till diff logic works within CI
* Fix recursion of dos2unix
-rw-r--r-- | .github/workflows/format.yaml | 4 | ||||
-rw-r--r-- | lib/python/qmk/cli/fileformat.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.github/workflows/format.yaml b/.github/workflows/format.yaml index ac0835c3a..9b32c4e61 100644 --- a/.github/workflows/format.yaml +++ b/.github/workflows/format.yaml | |||
@@ -6,7 +6,7 @@ on: | |||
6 | - master | 6 | - master |
7 | 7 | ||
8 | jobs: | 8 | jobs: |
9 | generate: | 9 | format: |
10 | runs-on: ubuntu-latest | 10 | runs-on: ubuntu-latest |
11 | container: qmkfm/base_container | 11 | container: qmkfm/base_container |
12 | 12 | ||
@@ -22,7 +22,7 @@ jobs: | |||
22 | 22 | ||
23 | - name: Format files | 23 | - name: Format files |
24 | run: | | 24 | run: | |
25 | bin/qmk cformat | 25 | bin/qmk cformat -a |
26 | bin/qmk pyformat | 26 | bin/qmk pyformat |
27 | bin/qmk fileformat | 27 | bin/qmk fileformat |
28 | 28 | ||
diff --git a/lib/python/qmk/cli/fileformat.py b/lib/python/qmk/cli/fileformat.py index 502a3b7b1..db8e13f10 100644 --- a/lib/python/qmk/cli/fileformat.py +++ b/lib/python/qmk/cli/fileformat.py | |||
@@ -9,5 +9,5 @@ import subprocess | |||
9 | def fileformat(cli): | 9 | def fileformat(cli): |
10 | """Run several general formatting commands. | 10 | """Run several general formatting commands. |
11 | """ | 11 | """ |
12 | dos2unix = subprocess.run(['bash', '-c', 'dos2unix **']) | 12 | dos2unix = subprocess.run(['bash', '-c', 'git ls-files -z | xargs -0 dos2unix']) |
13 | return dos2unix.returncode | 13 | return dos2unix.returncode |