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) | |
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 ac0835c3af..9b32c4e619 100644 --- a/.github/workflows/format.yaml +++ b/.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 diff --git a/lib/python/qmk/cli/fileformat.py b/lib/python/qmk/cli/fileformat.py index 502a3b7b1f..db8e13f109 100644 --- a/lib/python/qmk/cli/fileformat.py +++ b/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 |