Skip to content

Commit 65f7bfc

Browse files
zvecrdrashna
authored andcommitted
Fix unknown key 'IndentPPDirectives' on CI (qmk#7933)
1 parent 4da2419 commit 65f7bfc

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

.travis.yml

+12-7
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,18 @@ env:
1212
- MAKEFLAGS="-j3 --output-sync"
1313
services:
1414
- docker
15+
addons:
16+
apt:
17+
sources:
18+
- ubuntu-toolchain-r-test
19+
- llvm-toolchain-trusty-7
20+
packages:
21+
- pandoc
22+
- diffutils
23+
- dos2unix
24+
- doxygen
25+
- clang-format-7
26+
- libstdc++-7-dev
1527
install:
1628
- npm install -g moxygen
1729
script:
@@ -20,13 +32,6 @@ script:
2032
- bash util/travis_test.sh
2133
- bash util/travis_build.sh
2234
- bash util/travis_docs.sh
23-
addons:
24-
apt:
25-
packages:
26-
- pandoc
27-
- diffutils
28-
- dos2unix
29-
- doxygen
3035
after_script:
3136
bash util/travis_compiled_push.sh
3237
notifications:

util/travis_compiled_push.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; the
1313
# fix formatting
1414
git checkout master
1515
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} '*.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
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-7 -i
1717
git diff --diff-filter=AM --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 git add
1818
git commit -m "format code according to conventions [skip ci]" && git push [email protected]:qmk/qmk_firmware.git master
1919

0 commit comments

Comments
 (0)