diff options
| author | skullydazed <skullydazed@users.noreply.github.com> | 2019-07-10 16:24:48 -0700 |
|---|---|---|
| committer | skullydazed <skullydazed@users.noreply.github.com> | 2019-08-30 15:01:52 -0700 |
| commit | 210da974a071ca4df810e5330bdaf10ef0c6dfef (patch) | |
| tree | 181263dd1084820c193f5776d7fa340b538bd8a5 | |
| parent | 554e4bf25c4bcbf263b2e73c6148b7ea1d520762 (diff) | |
| download | qmk_firmware-210da974a071ca4df810e5330bdaf10ef0c6dfef.tar.gz qmk_firmware-210da974a071ca4df810e5330bdaf10ef0c6dfef.zip | |
Add new files to the list of files that are formatted. (#6296)
| -rwxr-xr-x | util/travis_compiled_push.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh index f20e30cdb..4737d693b 100755 --- a/util/travis_compiled_push.sh +++ b/util/travis_compiled_push.sh | |||
| @@ -11,10 +11,10 @@ if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; the | |||
| 11 | 11 | ||
| 12 | # fix formatting | 12 | # fix formatting |
| 13 | git checkout master | 13 | git checkout master |
| 14 | git diff --diff-filter=M --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 dos2unix | 14 | git diff --diff-filter=AM --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 dos2unix |
| 15 | git diff --diff-filter=M --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | grep -e '^drivers' -e '^quantum' -e '^tests' -e '^tmk_core' | xargs -0 clang-format | 15 | git diff --diff-filter=AM --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | grep -e '^drivers' -e '^quantum' -e '^tests' -e '^tmk_core' | xargs -0 clang-format |
| 16 | git diff --diff-filter=M --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 git add | 16 | git diff --diff-filter=AM --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 git add |
| 17 | git commit -m "convert to unix line-endings [skip ci]" && git push git@github.com:qmk/qmk_firmware.git master | 17 | git commit -m "format code according to conventions [skip ci]" && git push git@github.com:qmk/qmk_firmware.git master |
| 18 | 18 | ||
| 19 | increment_version () | 19 | increment_version () |
| 20 | { | 20 | { |
