diff options
author | QMK Bot <hello@qmk.fm> | 2021-11-14 23:06:50 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2021-11-14 23:06:50 +0000 |
commit | 462c3a615113e84ac3ca837a5caeb928c0ec8505 (patch) | |
tree | e7e380167da9131d71c367f5e94015687ac2f923 /.github | |
parent | f7536f3adfa10d2d5a8eaf89004de00a6ad46581 (diff) | |
parent | ec0bb791f89c1ba53a9dcc3ca02ec6ad9823d2a1 (diff) | |
download | qmk_firmware-462c3a615113e84ac3ca837a5caeb928c0ec8505.tar.gz qmk_firmware-462c3a615113e84ac3ca837a5caeb928c0ec8505.zip |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to '.github')
-rw-r--r-- | .github/workflows/format.yaml | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/.github/workflows/format.yaml b/.github/workflows/format.yaml index 0bb8701068..9e165e0e8d 100644 --- a/.github/workflows/format.yaml +++ b/.github/workflows/format.yaml @@ -19,7 +19,9 @@ jobs: container: qmkfm/qmk_cli steps: - - uses: rlespinasse/github-slug-action@v3.x + - name: Install dependencies + run: | + apt-get update && apt-get install -y dos2unix - uses: actions/checkout@v2 with: @@ -31,12 +33,17 @@ jobs: output: ' ' fileOutput: ' ' - - name: Run qmk format-c and qmk format-python + - name: Run qmk formatters shell: 'bash {0}' run: | - qmk format-c --core-only -n $(< ~/files.txt) - format_c_exit=$? - qmk format-python -n - format_python_exit=$? + qmk format-c --core-only $(< ~/files.txt) + qmk format-python + qmk format-text $(< ~/files.txt) + git diff - exit $((format_c_exit + format_python_exit)) + - name: Fail when formatting required + run: | + for file in $(git diff --name-only); do + echo "::error file=${file}::::File Requires Formatting" + done + test -z "$(git diff --name-only)" |