From 425b3923d23d1ba09293416d8cbe667952701ac1 Mon Sep 17 00:00:00 2001
From: James Rowe <jroweboy@gmail.com>
Date: Sat, 20 Jan 2018 01:09:19 -0700
Subject: [PATCH] Travis: Update clang-format to 6.0
---
.travis.yml | 5 ++++-
.travis/clang-format/script.sh | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index f94a5c75ea..2816a3f57b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,11 @@ 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'
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 80a0f47e52..0f6e8e6e43 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