From 32fbde25ec774c732cc4e73fc543b12b99761198 Mon Sep 17 00:00:00 2001
From: Corentin Wallez <cwallez@chromium.org>
Date: Mon, 29 Jan 2018 11:25:51 -0500
Subject: [PATCH] Fix Travis after LLVM APT repo change

After LLVM 6.0 was branched, the LLVM APT repositories changed so that
clang-format-7 is in the "latest" repo instead of 6.0. We cannot use
the LLVM-6.0 repo in Travis yet because it isn't in the repo whitelist.
Update travis.yml to use clang-format-7
---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b6535328a2..01d19c3c6c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@ addons:
   sources:
    # PPA for clang 5.0
    - llvm-toolchain-trusty-5.0
-   # PPA for clang-format 6.0
+   # PPA for clang-format 7
    - llvm-toolchain-trusty
    # PPA for a more recen libstdc++
    - ubuntu-toolchain-r-test
@@ -38,7 +38,7 @@ addons:
    # Required dependency for GLFW on Linux
    - xorg-dev
    # Format using the latest and greatest
-   - clang-format-6.0
+   - clang-format-7
 
 before_install:
  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi
@@ -70,4 +70,4 @@ script:
  - cd ..
 
  # Lint
- - if [ "$TRAVIS_OS_NAME" == "linux" ]; then ./scripts/travis_lint_format.sh clang-format-6.0; fi
+ - if [ "$TRAVIS_OS_NAME" == "linux" ]; then ./scripts/travis_lint_format.sh clang-format-7; fi