|
@@ -76,7 +76,8 @@ fi
|
|
|
|
|
|
# To get consistent formatting, we recommend contributors to use the same
|
|
|
# clang-format version as CI.
|
|
|
-RECOMMENDED_CLANG_FORMAT_MAJOR="11"
|
|
|
+RECOMMENDED_CLANG_FORMAT_MAJOR_MIN="11"
|
|
|
+RECOMMENDED_CLANG_FORMAT_MAJOR_MAX="12"
|
|
|
|
|
|
if [ ! -x "$CLANG_FORMAT" ] ; then
|
|
|
message="Error: clang-format executable not found. Please install clang-format $RECOMMENDED_CLANG_FORMAT_MAJOR.x.x."
|
|
@@ -106,8 +107,8 @@ fi
|
|
|
CLANG_FORMAT_VERSION="$(clang-format --version | sed "s/[^0-9\.]*\([0-9\.]*\).*/\1/")"
|
|
|
CLANG_FORMAT_MAJOR="$(echo "$CLANG_FORMAT_VERSION" | cut -d. -f1)"
|
|
|
|
|
|
-if [ "$CLANG_FORMAT_MAJOR" != "$RECOMMENDED_CLANG_FORMAT_MAJOR" ]; then
|
|
|
- echo "Warning: Your clang-format binary is the wrong version ($CLANG_FORMAT_VERSION, expected $RECOMMENDED_CLANG_FORMAT_MAJOR.x.x)."
|
|
|
+if [[ "$CLANG_FORMAT_MAJOR" -lt "$RECOMMENDED_CLANG_FORMAT_MAJOR_MIN" || "$CLANG_FORMAT_MAJOR" -gt "$RECOMMENDED_CLANG_FORMAT_MAJOR_MAX" ]]; then
|
|
|
+ echo "Warning: Your clang-format binary is the wrong version ($CLANG_FORMAT_VERSION, expected between $RECOMMENDED_CLANG_FORMAT_MAJOR_MIN.x.x and $RECOMMENDED_CLANG_FORMAT_MAJOR_MAX.x.x)."
|
|
|
echo " Consider upgrading or downgrading clang-format as formatting may not be applied correctly."
|
|
|
fi
|
|
|
|