From 3b9c0bdf91638db41bf48423b2f04231913ed066 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 16 Mar 2021 16:06:46 +0100 Subject: [PATCH] CI: don't allow clang-format 7 any more --- ci/calamaresstyle | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ci/calamaresstyle b/ci/calamaresstyle index 42adc33cc..81ec71c39 100755 --- a/ci/calamaresstyle +++ b/ci/calamaresstyle @@ -36,7 +36,12 @@ test -x "$AS" || { echo "! $AS is not executable."; exit 1 ; } test -x "$CF" || { echo "! $CF is not executable."; exit 1 ; } unmangle_clang_format="" -if expr `"$CF" --version | tr -dc '[^.0-9]' | cut -d . -f 1` '<' 10 > /dev/null ; then +format_version=`"$CF" --version | tr -dc '[^.0-9]' | cut -d . -f 1` +if expr "$format_version" '<' 8 > /dev/null ; then + echo "! Clang-format version 8+ required" + exit 1 +fi +if expr "$format_version" '<' 10 > /dev/null ; then : else unmangle_clang_format=$( dirname $0 )/../.clang-format