Skip to content

Commit 894814b

Browse files
committed
Merge branch 'travis'
2 parents 63e4208 + 6007766 commit 894814b

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

.travis.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
language: ruby
2+
dist: trusty
23
rvm:
34
- 1.9.3
45
env:
5-
- CLANG_VERSION="3.7"
6-
- CLANG_VERSION="3.8"
6+
- CLANG_VERSION="4.0"
7+
- CLANG_VERSION="5.0"
78

89
install:
910
- bundle install
@@ -15,10 +16,10 @@ script:
1516
addons:
1617
apt:
1718
sources:
18-
- llvm-toolchain-precise-3.8
19-
- llvm-toolchain-precise-3.7
19+
- llvm-toolchain-trusty-5.0
20+
- llvm-toolchain-trusty-4.0
2021
- ubuntu-toolchain-r-test
2122
packages:
2223
- g++-4.9
23-
- clang-format-3.7
24-
- clang-format-3.8
24+
- clang-format-5.0
25+
- clang-format-4.0

t/clang_format_spec.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ function! s:detect_clang_format() abort
88
return $CLANG_FORMAT
99
endif
1010

11-
for suffix in ['-HEAD', '-3.8', '-3.7', '-3.6', '-3.5', '-3.4', '']
11+
for suffix in ['-HEAD', '-5.0', '-4.0', '-3.8', '-3.7', '-3.6', '-3.5', '-3.4', '']
1212
let c = 'clang-format' . suffix
1313
if executable(c)
1414
return c

0 commit comments

Comments
 (0)