Skip to content

Commit 2139fbe

Browse files
authored
[ci] Update clang-format (#4628)
Use the default version of clang-format so we be consistent in the version that we use across workflows and we don't have to manually update it from time to time.
2 parents 4821ccd + cbafb3c commit 2139fbe

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

.github/workflows/lint.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,18 +47,21 @@ jobs:
4747

4848
- name: Install clang-format
4949
shell: bash
50-
run: sudo apt-get install --no-install-recommends --yes clang-format-16
50+
run: sudo apt-get install --no-install-recommends --yes clang-format
5151

5252
- name: Run clang-format through the diff
5353
shell: bash
5454
run: |
55+
# Print out version of clang-format being used
56+
clang-format --version
57+
5558
# Ensure that the .clang-format configuration is valid
56-
clang-format-16 --dump-config > /dev/null
59+
clang-format --dump-config > /dev/null
5760
5861
# On pull requests, HEAD^1 will always be the merge base, so consider that diff for formatting.
5962
git diff -U0 --no-color HEAD^1 \
6063
| grep -vE '^\+\+\+ b/tests/unit/test_data/formatters/' \
61-
| clang-format-diff-16 -p1 \
64+
| clang-format-diff -p1 \
6265
| tee ${HOME}/clang-diff
6366
6467
if [ "$( stat --printf='%s' ${HOME}/clang-diff )" -ne 0 ]; then

0 commit comments

Comments
 (0)