Skip to content

Commit ea26398

Browse files
committed
Pin clang-format in CI recipe not the script itself
1 parent 42cf199 commit ea26398

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

.github/workflows/style-check.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
run: |
2828
sudo apt update
2929
python ./tests/test_restyle.py --quiet
30-
bash ./tests/ci/style_check.sh
30+
env CLANG_FORMAT="clang-format-18" bash ./tests/ci/style_check.sh
3131
3232
# Validate orthography
3333

tests/restyle.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ test -d ${root}/cores/esp8266
88
test -d ${root}/libraries
99

1010
# allow `env CLANG_FORMAT=clang-format-N`, or some other version
11-
# default to v15, latest stable version from ubuntu-latest Github Actions image
12-
CLANG_FORMAT=${CLANG_FORMAT:-clang-format-15}
11+
CLANG_FORMAT=${CLANG_FORMAT:-clang-format}
1312

1413
cd $root
1514
python $root/tests/restyle.py format --clang-format=$CLANG_FORMAT preset --include core --include arduino

0 commit comments

Comments
 (0)