Travis: Update clang-format to 6.0
This commit is contained in:
parent
096be16636
commit
425b3923d2
@ -6,8 +6,11 @@ matrix:
|
|||||||
dist: trusty
|
dist: trusty
|
||||||
addons:
|
addons:
|
||||||
apt:
|
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'
|
||||||
packages:
|
packages:
|
||||||
- clang-format-3.9
|
- clang-format-6.0
|
||||||
script: "./.travis/clang-format/script.sh"
|
script: "./.travis/clang-format/script.sh"
|
||||||
- os: linux
|
- os: linux
|
||||||
env: NAME="linux build"
|
env: NAME="linux build"
|
||||||
|
@ -7,7 +7,7 @@ if grep -nr '\s$' src *.yml *.txt *.md Doxyfile .gitignore .gitmodules .travis*
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Default clang-format points to default 3.5 version one
|
# 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
|
$CLANG_FORMAT --version
|
||||||
|
|
||||||
if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then
|
if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then
|
||||||
|
Loading…
Reference in New Issue
Block a user