From aae951ce890c3417895b7efccb19699b552d8d76 Mon Sep 17 00:00:00 2001 From: "Jonathan R. Madsen" Date: Fri, 26 Jul 2024 15:28:09 -0500 Subject: [PATCH] Bump clang-format to version 11 --- .github/workflows/formatting.yml | 4 ++-- cmake/Modules/PTLFormatting.cmake | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml index 7903d87..f7ff697 100644 --- a/.github/workflows/formatting.yml +++ b/.github/workflows/formatting.yml @@ -20,14 +20,14 @@ jobs: - name: Install dependencies run: | sudo apt-get update - sudo apt-get install -y clang-format-9 cmake + sudo apt-get install -y clang-format-11 cmake - name: clang-format run: | cmake -B build-PTL -DPTL_USE_TBB=OFF . cmake --build build-PTL --target format-source rm -rf build-PTL if [ $(git diff | wc -l) -gt 0 ]; then - echo -e "\nError! Source code not formatted. Run clang-format-9...\n" + echo -e "\nError! Source code not formatted. Run clang-format-11...\n" echo -e "\nFiles:\n" git diff --name-only echo -e "\nFull diff:\n" diff --git a/cmake/Modules/PTLFormatting.cmake b/cmake/Modules/PTLFormatting.cmake index 6ea3499..787e9b3 100644 --- a/cmake/Modules/PTLFormatting.cmake +++ b/cmake/Modules/PTLFormatting.cmake @@ -3,7 +3,7 @@ if(PTL_CLANG_FORMATTER MATCHES ".*-6") unset(PTL_CLANG_FORMATTER CACHE) endif() -find_program(PTL_CLANG_FORMATTER NAMES clang-format-9 clang-format-mp-9.0 clang-format) +find_program(PTL_CLANG_FORMATTER NAMES clang-format-11 clang-format-mp-11.0 clang-format) mark_as_advanced(PTL_CLANG_FORMATTER) find_program(PTL_CMAKE_FORMATTER NAMES cmake-format)