Merge remote-tracking branch 'origin/master' into develop

4 years ago · e20bc76a1e
parent 33d8af50c3 e73d22d7f1
commit e20bc76a1e
1 changed files with 3 additions and 4 deletions
--- a/.github/workflows/format.yaml
+++ b/.github/workflows/format.yaml
@ -36,11 +36,10 @@ jobs:
    - name: Run qmk formatters
      shell: 'bash {0}'
      run: |
-        set +e
        cat ~/files_added.txt ~/files_modified.txt > ~/files_changed.txt
-        qmk format-c --core-only $(< ~/files_changed.txt)
-        qmk format-python $(< ~/files_changed.txt)
-        qmk format-text $(< ~/files_changed.txt)
+        qmk format-c --core-only $(< ~/files_changed.txt) || true
+        qmk format-python $(< ~/files_changed.txt) || true
+        qmk format-text $(< ~/files_changed.txt) || true

    - name: Fail when formatting required
      run: |