From 43efd0767f55840695bda64c92eb7435e6bceb36 Mon Sep 17 00:00:00 2001 From: Siarhei Fedartsou Date: Tue, 4 Oct 2022 18:02:23 +0200 Subject: [PATCH] Use clang-format from CI base image --- scripts/format.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/format.sh b/scripts/format.sh index 1a256d27e..fd330fd8e 100755 --- a/scripts/format.sh +++ b/scripts/format.sh @@ -19,18 +19,18 @@ elif [[ ${OS} = "Darwin" ]] ; then fi # Discover clang-format -if type clang-format-14 2> /dev/null ; then - CLANG_FORMAT=clang-format-14 +if type clang-format-11 2> /dev/null ; then + CLANG_FORMAT=clang-format-11 elif type clang-format 2> /dev/null ; then # Clang format found, but need to check version CLANG_FORMAT=clang-format V=$(clang-format --version) - if [[ $V != *14.0* ]] ; then - echo "clang-format is not 14.0 (returned ${V})" + if [[ $V != *11.0* ]] ; then + echo "clang-format is not 11.0 (returned ${V})" #exit 1 fi else - echo "No appropriate clang-format found (expected clang-format-14, or clang-format)" + echo "No appropriate clang-format found (expected clang-format-11, or clang-format)" exit 1 fi