File tree 3 files changed +10
-14
lines changed
3 files changed +10
-14
lines changed Original file line number Diff line number Diff line change @@ -21,6 +21,7 @@ AlwaysBreakTemplateDeclarations: true
21
21
BinPackArguments : false
22
22
BinPackParameters : false
23
23
BraceWrapping :
24
+ AfterCaseLabel : true
24
25
AfterClass : true
25
26
AfterControlStatement : true
26
27
AfterEnum : true
Original file line number Diff line number Diff line change @@ -35,15 +35,12 @@ endmacro()
35
35
36
36
macro (clangformat_targets)
37
37
# The clang-format tool is installed under a variety of different names. Try
38
- # to find a sensible one. Only look for versions 6 to 8 explicitly - we don't
38
+ # to find a sensible one. Only look for versions 9 explicitly - we don't
39
39
# know whether our clang-format file will work with newer versions of the
40
- # tool
40
+ # tool. It does not work with older versions as AfterCaseLabel is not supported
41
+ # in earlier versions.
41
42
find_program (CLANG_FORMAT NAMES
42
- clang-format-8
43
- clang-format-7.0
44
- clang-format-6.0
45
- clang-format70
46
- clang-format60
43
+ clang-format-9
47
44
clang-format)
48
45
49
46
# If we've found a clang-format tool, generate a target for it, otherwise emit
Original file line number Diff line number Diff line change @@ -225,15 +225,15 @@ jobs:
225
225
- job :
226
226
displayName : Format
227
227
pool :
228
- vmImage : ' ubuntu-16 .04'
228
+ vmImage : ' ubuntu-18 .04'
229
229
steps :
230
230
- script : |
231
231
set -eo pipefail
232
232
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
233
- sudo add- apt-repository "deb http://apt.llvm.org/xenial / llvm-toolchain-xenial-8 main"
233
+ sudo apt-add- repository "deb http://apt.llvm.org/bionic / llvm-toolchain-bionic-9 main"
234
234
sudo apt-get update
235
- sudo apt-get install -y clang-format-8 clang-tidy-8
236
- sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-8 100
235
+ sudo apt-get install -y clang-format-9
236
+ sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-9 100
237
237
238
238
displayName: 'Install clang'
239
239
@@ -245,7 +245,6 @@ jobs:
245
245
- script : |
246
246
set -eo pipefail
247
247
make clangformat
248
- git diff
249
248
git diff --exit-code $(Build.SourceVersion)
250
249
251
250
workingDirectory: build
@@ -254,7 +253,6 @@ jobs:
254
253
255
254
- script : |
256
255
set -eo pipefail
257
- clang-tidy-8 src/override/malloc.cc -header-filter="`pwd`/*" -export-fixes=tidy.fail -- -std=c++17 -mcx16
258
- if [ -f tidy.fail ] ; then exit 1 ; fi
256
+ clang-tidy-9 src/override/malloc.cc -header-filter="`pwd`/*" -warnings-as-errors='*' -export-fixes=tidy.fail -- -std=c++17 -mcx16
259
257
260
258
displayName: 'Clang-Tidy'
You can’t perform that action at this time.
0 commit comments