summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar James Rowe2018-01-20 01:09:19 -0700
committerGravatar James Rowe2018-01-20 16:45:11 -0700
commit425b3923d23d1ba09293416d8cbe667952701ac1 (patch)
tree197200823396ef307993838b3951b7575534a1cc
parentFormat: Run the new clang format on everything (diff)
downloadyuzu-425b3923d23d1ba09293416d8cbe667952701ac1.tar.gz
yuzu-425b3923d23d1ba09293416d8cbe667952701ac1.tar.xz
yuzu-425b3923d23d1ba09293416d8cbe667952701ac1.zip
Travis: Update clang-format to 6.0
-rw-r--r--.travis.yml5
-rwxr-xr-x.travis/clang-format/script.sh2
2 files changed, 5 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index f94a5c75e..2816a3f57 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,11 @@ matrix:
6 dist: trusty 6 dist: trusty
7 addons: 7 addons:
8 apt: 8 apt:
9 sources:
10 - sourceline: 'deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-6.0 main'
11 key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
9 packages: 12 packages:
10 - clang-format-3.9 13 - clang-format-6.0
11 script: "./.travis/clang-format/script.sh" 14 script: "./.travis/clang-format/script.sh"
12 - os: linux 15 - os: linux
13 env: NAME="linux build" 16 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*
7fi 7fi
8 8
9# Default clang-format points to default 3.5 version one 9# Default clang-format points to default 3.5 version one
10CLANG_FORMAT=clang-format-3.9 10CLANG_FORMAT=clang-format-6.0
11$CLANG_FORMAT --version 11$CLANG_FORMAT --version
12 12
13if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then 13if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then