Skip to content

Commit

Permalink
Update clang-format to v15
Browse files Browse the repository at this point in the history
  • Loading branch information
martinjaeger authored and garethpotter committed Oct 23, 2023
1 parent 57b787d commit 7a8a2c4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions scripts/check-style.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 7a8a2c4

Please sign in to comment.