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/workflows | |
| 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/workflows')
| -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 9e165e0e8..645e0ce10 100644 --- a/.github/workflows/format.yaml +++ b/.github/workflows/format.yaml | |||
| @@ -37,7 +37,7 @@ jobs: | |||
| 37 | shell: 'bash {0}' | 37 | shell: 'bash {0}' |
| 38 | run: | | 38 | run: | |
| 39 | qmk format-c --core-only $(< ~/files.txt) | 39 | qmk format-c --core-only $(< ~/files.txt) |
| 40 | qmk format-python | 40 | qmk format-python $(< ~/files.txt) |
| 41 | qmk format-text $(< ~/files.txt) | 41 | qmk format-text $(< ~/files.txt) |
| 42 | git diff | 42 | git diff |
| 43 | 43 | ||
diff --git a/.github/workflows/format_push.yaml b/.github/workflows/format_push.yaml index 8b579bf86..b79130f17 100644 --- a/.github/workflows/format_push.yaml +++ b/.github/workflows/format_push.yaml | |||
| @@ -25,7 +25,7 @@ jobs: | |||
| 25 | shell: 'bash {0}' | 25 | shell: 'bash {0}' |
| 26 | run: | | 26 | run: | |
| 27 | qmk format-c -a | 27 | qmk format-c -a |
| 28 | qmk format-python | 28 | qmk format-python -a |
| 29 | qmk format-text -a | 29 | qmk format-text -a |
| 30 | git diff | 30 | git diff |
| 31 | 31 | ||