citra-emu
/
citra
Archived
1
0
Fork 0
Code

Travis: Update clang-format to 6.0

This commit is contained in:
James Rowe 2018-01-20 01:09:19 -07:00
parent b6d94864fd
commit ed36edf69c
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -6,8 +6,12 @@ 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'
- sourceline: 'deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu trusty main'
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"

2
.travis/clang-format/script.sh
View File

@ -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