From ac3cb0f163f1ceca4f3c651a05b1a5b1b738240f Mon Sep 17 00:00:00 2001
From: Michael Tautschnig <tautschn@amazon.com>
Date: Fri, 12 Oct 2018 10:24:03 +0000
Subject: [PATCH] Move to clang-format-6.0 and cleanup config

As we are moving to clang-6.0 in other parts of the Travis configuration we
might as well use clang-format-6.0 in line with this. Also clean up the script
that used to ack around paths by just specifying the binary to use on the
command-line.
---
 .travis.yml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b11be4cc262..0aec6ac7edb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,18 +8,14 @@ jobs:
       env: NAME="clang-format"
       addons:
         apt:
+          sources:
+            - llvm-toolchain-trusty-6.0
           packages:
-            - clang-format-3.8
+            - clang-format-6.0
       install:
       script: |
-        # Apparently update-alternatives doesn't work in Travis containers
-        mkdir -p priority-symlinks
-        ln -s /usr/bin/clang-format-3.8 priority-symlinks/clang-format
-        export PATH=${PWD}/priority-symlinks:${PATH}
-
-        # Now we can do the formatting pass
         clang-format --version
-        git-clang-format-3.8 "${TRAVIS_BRANCH}"
+        git-clang-format-6.0 --binary clang-format-6.0 "${TRAVIS_BRANCH}"
         git diff > formatted.diff
         if [[ -s formatted.diff ]] ; then
           echo 'Formatting error! The following diff shows the required changes'