File tree Expand file tree Collapse file tree 2 files changed +8
-7
lines changed Expand file tree Collapse file tree 2 files changed +8
-7
lines changed Original file line number Diff line number Diff line change @@ -78,9 +78,9 @@ blocks:
78
78
- name : ' Style check'
79
79
commands :
80
80
- sudo apt update
81
- - sudo apt install -y clang-format-10 python3 python3-pip python3-setuptools
81
+ - sudo apt install -y clang-format-18 python3 python3-pip python3-setuptools
82
82
- python3 -m pip install -r packaging/tools/requirements.txt
83
- - CLANG_FORMAT=clang-format-10 make style-check
83
+ - make style-check
84
84
85
85
86
86
- name : ' Build documentation'
Original file line number Diff line number Diff line change 3
3
# Check or apply/fix the project coding style to all files passed as arguments.
4
4
# Uses clang-format for C/C++ and flake8 for Python.
5
5
#
6
- # Requires clang-format version 10 (apt install clang-format-10).
7
- #
8
6
9
7
10
- CLANG_FORMAT=${CLANG_FORMAT:- clang-format}
8
+
9
+ # Requires clang-format version 18 (apt install clang-format-18).
10
+ CLANG_FORMAT=${CLANG_FORMAT:- clang-format-18}
11
+ CLANG_FORMAT_REQUIRED_VERSION=18
11
12
12
13
set -e
13
14
27
28
fi
28
29
29
30
clang_format_version=$( ${CLANG_FORMAT} --version | sed -Ee ' s/.*version ([[:digit:]]+)\.[[:digit:]]+\.[[:digit:]]+.*/\1/' )
30
- if [[ $clang_format_version != " 10 " ]] ; then
31
- echo " $0 : clang-format version 10 , '$clang_format_version ' detected"
31
+ if [[ $clang_format_version != " $CLANG_FORMAT_REQUIRED_VERSION " ]] ; then
32
+ echo " $0 : clang-format version ${CLANG_FORMAT_REQUIRED_VERSION} , '$clang_format_version ' detected"
32
33
exit 1
33
34
fi
34
35
You can’t perform that action at this time.
0 commit comments