From 099666214ecd13e2bb34cc1e2457878e99546ee6 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Tue, 20 Jan 2026 20:47:17 +0100 Subject: [PATCH] chore: bump clang-format version to 21 in script --- tools/run-clang-format.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/run-clang-format.sh b/tools/run-clang-format.sh index ce1a664..41c92f5 100755 --- a/tools/run-clang-format.sh +++ b/tools/run-clang-format.sh @@ -25,10 +25,10 @@ SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )" MAINSOURCE=$SCRIPTPATH/.. ALL_FILES=$(cd $MAINSOURCE && git ls-tree --full-tree --name-only -r HEAD | grep -e ".*\.\(c\|h\|cc\|cpp\|hh\)\$") -if clang-format-17 --version 2>/dev/null | grep -qF 'version 17.'; then - cd $MAINSOURCE; clang-format-17 --style=file --verbose -i "$@" $ALL_FILES +if clang-format-21 --version 2>/dev/null | grep -qF 'version 21.'; then + cd $MAINSOURCE; clang-format-21 --style=file --verbose -i "$@" $ALL_FILES exit 0 -elif clang-format --version 2>/dev/null | grep -qF 'version 17.'; then +elif clang-format --version 2>/dev/null | grep -qF 'version 21.'; then cd $MAINSOURCE; clang-format --style=file --verbose -i "$@" $ALL_FILES exit 0 fi @@ -37,6 +37,6 @@ command -v docker >/dev/null 2>&1 || { echo >&2 "Please install docker. E.g., go docker info >/dev/null 2>&1 || { echo >&2 "Docker server is not running? type 'docker info'."; exit 1; } if [ -t 0 ]; then DOCKER_ARGS=-it; fi -docker pull kszonek/clang-format-17 +docker pull kszonek/clang-format-21 -docker run --rm $DOCKER_ARGS -v "$MAINSOURCE":"$MAINSOURCE":Z -w "$MAINSOURCE" -u "$(id -u $USER):$(id -g $USER)" kszonek/clang-format-17 --style=file --verbose -i "$@" $ALL_FILES +docker run --rm $DOCKER_ARGS -v "$MAINSOURCE":"$MAINSOURCE":Z -w "$MAINSOURCE" -u "$(id -u $USER):$(id -g $USER)" kszonek/clang-format-21 --style=file --verbose -i "$@" $ALL_FILES