From 2c5b1a837f0912554f82cfb60f278dc06ca514b0 Mon Sep 17 00:00:00 2001 From: Ryan Foster Date: Wed, 13 Oct 2021 01:09:02 -0400 Subject: [PATCH] CI: Update clang-format from 10 to 12 Microsoft Visual Studio 2019 ships with LLVM/Clang 12 as of Visual Studio 2019 16.11.0 (August 10, 2021). LLVM/Clang 12 is available on all platforms. This change should make it easier to have clang-format "just work" on dev systems and be consistent across platforms without having to use an outdated version. --- .github/workflows/clang-format.yml | 2 +- formatcode.sh | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml index e7caba461..5407ade79 100644 --- a/.github/workflows/clang-format.yml +++ b/.github/workflows/clang-format.yml @@ -13,7 +13,7 @@ jobs: - name: Install clang format run: | - sudo apt-get install -y clang-format-10 + sudo apt-get install -y clang-format-12 - name: Check the Formatting run: | diff --git a/formatcode.sh b/formatcode.sh index f776cf229..7144c6040 100755 --- a/formatcode.sh +++ b/formatcode.sh @@ -19,7 +19,9 @@ if [[ $OS = "Linux" || $OS = "Darwin" ]] ; then fi # Discover clang-format -if type clang-format-10 2> /dev/null ; then +if type clang-format-12 2> /dev/null ; then + CLANG_FORMAT=clang-format-12 +elif type clang-format-10 2> /dev/null ; then CLANG_FORMAT=clang-format-10 elif type clang-format-8 2> /dev/null ; then CLANG_FORMAT=clang-format-8