summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2020-12-10 17:02:28 +0000
committerQMK Bot <hello@qmk.fm>2020-12-10 17:02:28 +0000
commitf77f715aa2215ae08920f8c2929c3b181657456d (patch)
treed018f8ed0cfcce14c7b7f30e8a1243cc3a8af262 /util
parent15373c8367df04248cdf1f1eb80d08109ca62b85 (diff)
parent6c4b6531fe8fed46bec54fae993a1bab8246dd7d (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'util')
-rwxr-xr-xutil/travis_compiled_push.sh5
1 files changed, 0 insertions, 5 deletions
diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh
index a9c6f028fb..6300442fdb 100755
--- a/util/travis_compiled_push.sh
+++ b/util/travis_compiled_push.sh
@@ -10,12 +10,7 @@ echo "Using git hash ${rev}"
if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then
-# fix formatting
git checkout master
-git diff --diff-filter=AM --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 dos2unix
-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' -e 'platforms/chibios' | xargs -0 clang-format-7 -i
-git diff --diff-filter=AM --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 git add
-git commit -m "format code according to conventions [skip ci]" && git push git@github.com:qmk/qmk_firmware.git master
git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE}