diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 671a46f..05b64b3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: working-directory: thingset-zephyr-sdk run: | apt-get update - apt-get install -y clang-format-12 colordiff + apt-get install -y clang-format-15 colordiff git status bash scripts/check-style.sh diff --git a/scripts/check-style.sh b/scripts/check-style.sh index 6c5aa88..2438bda 100755 --- a/scripts/check-style.sh +++ b/scripts/check-style.sh @@ -7,8 +7,8 @@ DEFAULT_BRANCH="origin/main" if [ -x "$(command -v clang-format-diff)" ]; then CLANG_FORMAT_DIFF="clang-format-diff" -elif [ -x "$(command -v clang-format-diff-12)" ]; then -CLANG_FORMAT_DIFF="clang-format-diff-12" +elif [ -x "$(command -v clang-format-diff-15)" ]; then +CLANG_FORMAT_DIFF="clang-format-diff-15" elif [ -x "$(command -v /usr/share/clang/clang-format-diff.py)" ]; then CLANG_FORMAT_DIFF="/usr/share/clang/clang-format-diff.py -v" fi