From a281046e0e3001a149e23702fd6f14244a095701 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Petit?= Date: Tue, 25 Jun 2024 17:44:31 +0100 Subject: [PATCH] Bump clang-format version to 14 (#1983) Default version coming with Ubuntu 22.04 that the CI now uses. --- .github/workflows/presubmit.yml | 2 +- check-format.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml index 0da329e18..26c4af998 100644 --- a/.github/workflows/presubmit.yml +++ b/.github/workflows/presubmit.yml @@ -63,7 +63,7 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Install packages - run: sudo apt install -y clang-format clang-format-11 + run: sudo apt install -y clang-format clang-format-14 - uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/check-format.sh b/check-format.sh index b5dc0a72c..b76117c15 100755 --- a/check-format.sh +++ b/check-format.sh @@ -2,7 +2,7 @@ # Arg used to specify non-'origin/main' comparison branch ORIGIN_BRANCH=${1:-"origin/main"} -CLANG_BINARY=${2:-"`which clang-format-11`"} +CLANG_BINARY=${2:-"`which clang-format-14`"} # Run git-clang-format to check for violations CLANG_FORMAT_OUTPUT=$(git-clang-format --diff $ORIGIN_BRANCH --extensions c,cpp,h,hpp --binary $CLANG_BINARY)