diff options
| author | fauxpark <fauxpark@gmail.com> | 2019-10-10 21:48:37 +1100 |
|---|---|---|
| committer | Joel Challis <git@zvecr.com> | 2019-10-10 11:48:37 +0100 |
| commit | ed1bf3afa25d7e7674df7e8618dfaf243de3058b (patch) | |
| tree | cfe0e4331b8f00d09706dd0aaa8fef2cac3f61d7 /util | |
| parent | 528ddb79871b76d026c4b2ca8b1debf9feb1e751 (diff) | |
| download | firmware-ed1bf3afa25d7e7674df7e8618dfaf243de3058b.tar.gz firmware-ed1bf3afa25d7e7674df7e8618dfaf243de3058b.tar.bz2 firmware-ed1bf3afa25d7e7674df7e8618dfaf243de3058b.zip | |
Prevent clang-format messing up placeholder tokens within keyboard templates (#6790)
* Use .template file extension for keyboard template files
* Filter out .template files completely before passing to clang-format
* Undo file extension stuff; just ignore quantum/template dir
Diffstat (limited to 'util')
| -rwxr-xr-x | util/new_keyboard.sh | 4 | ||||
| -rwxr-xr-x | util/travis_compiled_push.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/util/new_keyboard.sh b/util/new_keyboard.sh index 35d89e402..fe7c1a829 100755 --- a/util/new_keyboard.sh +++ b/util/new_keyboard.sh @@ -41,8 +41,8 @@ copy_templates() { echo " done" echo -n "Renaming keyboard files..." - mv "${keyboard_dir}/template.c" "${keyboard_dir}/${keyboard_name}.c" - mv "${keyboard_dir}/template.h" "${keyboard_dir}/${keyboard_name}.h" + mv "${keyboard_dir}/keyboard.c" "${keyboard_dir}/${keyboard_name}.c" + mv "${keyboard_dir}/keyboard.h" "${keyboard_dir}/${keyboard_name}.h" echo " done" } diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh index 4737d693b..8ca65f21a 100755 --- a/util/travis_compiled_push.sh +++ b/util/travis_compiled_push.sh @@ -12,7 +12,7 @@ if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; the # 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} | grep -e '^drivers' -e '^quantum' -e '^tests' -e '^tmk_core' | xargs -0 clang-format +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 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 |