diff options
| author |  Joel Challis <git@zvecr.com> | 2020-01-19 21:59:57 +0000 |
|---|---|---|
| committer |  Drashna Jaelre <drashna@live.com> | 2020-01-19 13:59:57 -0800 |
| commit | 65f7bfcc8dbd47557846047457191d871faffff4 (patch) | |
| tree | da97ecc980272eaf3abfaf1d333e2c0b88cb62d9 | |
| parent | 4da241968cb9374f680e0133e5a1c828643df52b (diff) | |
| download | qmk_firmware-65f7bfcc8dbd47557846047457191d871faffff4.tar.gz | |
Fix unknown key 'IndentPPDirectives' on CI (#7933)
| -rw-r--r-- | .travis.yml | 19 | ||||
| -rwxr-xr-x | util/travis_compiled_push.sh | 2 |
2 files changed, 13 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index bfac998c1..d137a4209 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,18 @@ env: - MAKEFLAGS="-j3 --output-sync" services: - docker +addons: + apt: + sources: + - ubuntu-toolchain-r-test + - llvm-toolchain-trusty-7 + packages: + - pandoc + - diffutils + - dos2unix + - doxygen + - clang-format-7 + - libstdc++-7-dev install: - npm install -g moxygen script: @@ -20,13 +32,6 @@ script: - bash util/travis_test.sh - bash util/travis_build.sh - bash util/travis_docs.sh -addons: - apt: - packages: - - pandoc - - diffutils - - dos2unix - - doxygen after_script: bash util/travis_compiled_push.sh notifications: diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh index c18e42a29..68f6d5c11 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 # 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' | xargs -0 clang-format -i +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 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 |