Skip to content

Commit 84a4e97

Browse files
committed
drop clang-6,7,8 and gcc/g++7,8;add clang-format12
1 parent 42b6c32 commit 84a4e97

File tree

3 files changed

+4
-13
lines changed

3 files changed

+4
-13
lines changed

.github/scripts/install_dependencies.sh

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,13 @@ sudo apt install -y \
4141
qtbase5-dev \
4242
uuid-dev \
4343
default-jdk \
44-
clang-format-7 \
45-
g++-7 \
46-
gcc-7 \
47-
g++-8 \
48-
gcc-8 \
44+
clang-format-12 \
4945
g++-9 \
5046
gcc-9 \
5147
g++-10 \
5248
gcc-10 \
5349
g++-11 \
5450
gcc-11 \
55-
clang-6.0 \
56-
clang-7 \
5751
clang-10 \
5852
libtbb-dev
5953

.github/workflows/test.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -360,14 +360,11 @@ jobs:
360360
fail-fast: false
361361
matrix:
362362
include:
363-
- { name: 'GCC 7 (Ubuntu Bionic - 18.04)', eval: 'CC=gcc-7 && CXX=g++-7', }
364-
- { name: 'GCC 8 (Debian Buster)', eval: 'CC=gcc-8 && CXX=g++-8', }
365363
- { name: 'GCC 9 (Ubuntu Focal - 20.04)', eval: 'CC=gcc-9 && CXX=g++-9', }
366364
- { name: 'GCC 10 (Ubuntu Hirsute - 21.04)', eval: 'CC=gcc-10 && CXX=g++-10', }
367365
- { name: 'GCC 11 (Latest)', eval: 'CC=gcc-11 && CXX=g++-11', }
368-
- { name: 'Clang 6 (Ubuntu Bionic - 18.04)', eval: 'CC=clang-6.0 && CXX=clang++-6.0', }
369-
- { name: 'Clang 7 (Debian Buster)', eval: 'CC=clang-7 && CXX=clang++-7', }
370366
- { name: 'Clang 10 (Ubuntu Focal - 20.04)', eval: 'CC=clang-10 && CXX=clang++-10', }
367+
- { name: 'Clang 12 (Ubuntu Focal - 20.04)', eval: 'CC=clang-12 && CXX=clang++-12', }
371368
name: 'B: ${{ matrix.name }}'
372369
steps:
373370

cmake/modules/AutoClangFormat.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ add_custom_target(format-cpp-files
2121
COMMAND find ${DIRS_TO_FORMAT_CPP} ${FIND_TO_FORMAT_CPP})
2222

2323
#
24-
# Use clang-format-7 for code format
24+
# Use clang-format-12 for code format
2525
#
2626
add_custom_target(format-cpp
2727
COMMAND find ${DIRS_TO_FORMAT_CPP} ${FIND_TO_FORMAT_CPP} |
28-
xargs -P ${CPU_COUNT} clang-format-7 -style=file -i)
28+
xargs -P ${CPU_COUNT} clang-format-12 -style=file -i)
2929

3030
#
3131
# Use simple python script for fixing C like boxed comments

0 commit comments

Comments
 (0)