diff options
| author | Drashna Jael're <drashna@live.com> | 2021-11-19 09:48:23 -0800 |
|---|---|---|
| committer | Drashna Jael're <drashna@live.com> | 2021-11-19 09:48:23 -0800 |
| commit | 4be9919e9fd7c54c2e046b82e82f5fbc2fdd44e6 (patch) | |
| tree | 5a56b18bd8aff40ec480833f8ba2f7c48ef3279a /.github | |
| parent | a5155b98fb29ad4ea6de73f39a0d413d79883356 (diff) | |
| parent | 94b535024642bab6705f1e08ec62680d8e49b62b (diff) | |
| download | qmk_firmware-4be9919e9fd7c54c2e046b82e82f5fbc2fdd44e6.tar.gz qmk_firmware-4be9919e9fd7c54c2e046b82e82f5fbc2fdd44e6.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/format.yaml | 2 | ||||
| -rw-r--r-- | .github/workflows/format_push.yaml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.github/workflows/format.yaml b/.github/workflows/format.yaml index 9e165e0e8d..645e0ce106 100644 --- a/.github/workflows/format.yaml +++ b/.github/workflows/format.yaml @@ -37,7 +37,7 @@ jobs: shell: 'bash {0}' run: | qmk format-c --core-only $(< ~/files.txt) - qmk format-python + qmk format-python $(< ~/files.txt) qmk format-text $(< ~/files.txt) git diff diff --git a/.github/workflows/format_push.yaml b/.github/workflows/format_push.yaml index 8b579bf86f..b79130f17a 100644 --- a/.github/workflows/format_push.yaml +++ b/.github/workflows/format_push.yaml @@ -25,7 +25,7 @@ jobs: shell: 'bash {0}' run: | qmk format-c -a - qmk format-python + qmk format-python -a qmk format-text -a git diff |