Skip to content

Commit

Permalink
utils: fix clang-format version check (#3186)
Browse files Browse the repository at this point in the history
- Adopt to the fact the result of `clang-format --version` may look slightly different
  on various platforms.
- Make sure 'clang-format' version 15 is used (v 16+ results in unwanted changes)

Closes #3183
  • Loading branch information
nilason committed Oct 4, 2023
1 parent 0543864 commit b37c518
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions utils/grass_clang_format.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,11 @@ if ! (${fmt} --version >/dev/null); then
fi

clang_version_full=$(${fmt} --version)
clang_version=$(echo "${clang_version_full}" | cut -f3 -d" " | cut -f1 -d".")
if [ "${clang_version}" -lt "${req_cf_v}" ]; then
clang_version=$(echo "${clang_version_full}" | \
sed -En 's/.*version ([0-9]+)\.[0-9]+\.[0-9]+.*/\1/p')
if [ "${clang_version}" -ne "${req_cf_v}" ]; then
echo "Error: ${clang_version_full}"
echo " is used, but version ${req_cf_v} or newer is required."
echo " is used, but version ${req_cf_v} is required."
echo " Consider setting the global variable GRASS_CLANG_FORMAT to"
echo " the clang-format version needed."
exit 1
Expand Down

0 comments on commit b37c518

Please sign in to comment.