diff options
| author | Joel Challis <git@zvecr.com> | 2019-11-22 17:02:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-22 17:02:55 +0000 |
| commit | 7e9ed2acbfafd3146f884aa047ea8a7619a0a119 (patch) | |
| tree | 8b697617c7dfc676d13519afd68d0fafca1a4f21 /util | |
| parent | 66d473437110508af747b6ca09517bfad6c50d0b (diff) | |
| download | qmk_firmware-7e9ed2acbfafd3146f884aa047ea8a7619a0a119.tar.gz qmk_firmware-7e9ed2acbfafd3146f884aa047ea8a7619a0a119.zip | |
Fix clang-format logic within CI (#7386)
Diffstat (limited to 'util')
| -rwxr-xr-x | util/travis_compiled_push.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh index e0490cd70..c18e42a29 100755 --- a/util/travis_compiled_push.sh +++ b/util/travis_compiled_push.sh | |||
| @@ -13,7 +13,7 @@ if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; the | |||
| 13 | # fix formatting | 13 | # fix formatting |
| 14 | git checkout master | 14 | git checkout master |
| 15 | git diff --diff-filter=AM --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 dos2unix | 15 | git diff --diff-filter=AM --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 dos2unix |
| 16 | git diff --diff-filter=AM --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | grep -e '^drivers' -e '^quantum' -e '^tests' -e '^tmk_core' | grep -v 'quantum/template' | xargs -0 clang-format | 16 | git diff --diff-filter=AM --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} '*.c' '*.h' '*.cpp' | grep -z -e '^drivers' -e '^quantum' -e '^tests' -e '^tmk_core' | grep -zv -e 'quantum/template' -e 'tmk_core/protocol/usb_hid' | xargs -0 clang-format -i |
| 17 | git diff --diff-filter=AM --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 git add | 17 | git diff --diff-filter=AM --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 git add |
| 18 | git commit -m "format code according to conventions [skip ci]" && git push git@github.com:qmk/qmk_firmware.git master | 18 | git commit -m "format code according to conventions [skip ci]" && git push git@github.com:qmk/qmk_firmware.git master |
| 19 | 19 | ||