From 8f05bb780afa9947b87a5559486ccdee6857f4ff Mon Sep 17 00:00:00 2001 From: FearlessTobi Date: Sat, 8 Aug 2020 18:54:49 +0200 Subject: [PATCH 1/3] ci: Make use of clang-format 10.0 10.0 seems to play nicer with C++ attributes compared to clang-format 6.0. --- .travis/clang-format/script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis/clang-format/script.sh b/.travis/clang-format/script.sh index 3eff6322fb..56a785fe05 100755 --- a/.travis/clang-format/script.sh +++ b/.travis/clang-format/script.sh @@ -7,7 +7,7 @@ if grep -nrI '\s$' src *.yml *.txt *.md Doxyfile .gitignore .gitmodules .travis* fi # Default clang-format points to default 3.5 version one -CLANG_FORMAT=clang-format-6.0 +CLANG_FORMAT=clang-format-10.0 $CLANG_FORMAT --version if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then From 09ebfebc911ca60831f6c96db3d9bedf5695a343 Mon Sep 17 00:00:00 2001 From: FearlessTobi Date: Sat, 8 Aug 2020 18:56:01 +0200 Subject: [PATCH 2/3] CMakeLists: Update CLANG_FORMAT_POSTFIX to 10.0 This was forgotten to be changed in previous PRs. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a145c76d03..46c0b2aec8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -250,7 +250,7 @@ endif() # against all the src files. This should be used before making a pull request. # ======================================================================= -set(CLANG_FORMAT_POSTFIX "-6.0") +set(CLANG_FORMAT_POSTFIX "-10.0") find_program(CLANG_FORMAT NAMES clang-format${CLANG_FORMAT_POSTFIX} clang-format From 1255d82b67ce7f996325133271ddb88318871c80 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 7 Aug 2020 09:13:40 -0400 Subject: [PATCH 3/3] General: Tidy up clang-format warnings --- .travis/clang-format/script.sh | 2 +- CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis/clang-format/script.sh b/.travis/clang-format/script.sh index 56a785fe05..8ee8374424 100755 --- a/.travis/clang-format/script.sh +++ b/.travis/clang-format/script.sh @@ -7,7 +7,7 @@ if grep -nrI '\s$' src *.yml *.txt *.md Doxyfile .gitignore .gitmodules .travis* fi # Default clang-format points to default 3.5 version one -CLANG_FORMAT=clang-format-10.0 +CLANG_FORMAT=clang-format-10 $CLANG_FORMAT --version if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then diff --git a/CMakeLists.txt b/CMakeLists.txt index 46c0b2aec8..a07bf007a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -250,7 +250,7 @@ endif() # against all the src files. This should be used before making a pull request. # ======================================================================= -set(CLANG_FORMAT_POSTFIX "-10.0") +set(CLANG_FORMAT_POSTFIX "-10") find_program(CLANG_FORMAT NAMES clang-format${CLANG_FORMAT_POSTFIX} clang-format