diff options
Diffstat (limited to '')
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rwxr-xr-x | .travis/clang-format/script.sh | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index f94a5c75e..4f2b17465 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,12 @@ matrix: dist: trusty addons: apt: + sources: + - sourceline: 'deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-6.0 main' + key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key' + - sourceline: 'deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu trusty main' packages: - - clang-format-3.9 + - clang-format-6.0 script: "./.travis/clang-format/script.sh" - os: linux env: NAME="linux build" diff --git a/.travis/clang-format/script.sh b/.travis/clang-format/script.sh index 80a0f47e5..0f6e8e6e4 100755 --- a/.travis/clang-format/script.sh +++ b/.travis/clang-format/script.sh @@ -7,7 +7,7 @@ if grep -nr '\s$' src *.yml *.txt *.md Doxyfile .gitignore .gitmodules .travis* fi # Default clang-format points to default 3.5 version one -CLANG_FORMAT=clang-format-3.9 +CLANG_FORMAT=clang-format-6.0 $CLANG_FORMAT --version if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then |