diff options
| author | Joel Challis <git@zvecr.com> | 2021-11-14 23:06:22 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-14 23:06:22 +0000 |
| commit | ec0bb791f89c1ba53a9dcc3ca02ec6ad9823d2a1 (patch) | |
| tree | eac65380fc087cabb45ce842942efc3456bfa854 /.github/workflows | |
| parent | b785305080fe6454d1a5c8a818c538d9e693090f (diff) | |
Partially reinstate CI formatting process (#15155)
* Partially reinstate CI formatting process
* Fix exit code on clean run
* Fix exit code on clean run
Diffstat (limited to '.github/workflows')
| -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)" |