Skip to content

Commit 2d58cdf

Browse files
authored
Merge pull request #158 from hzeller/feature-20250926-use-newer-clang-format
Use newer clang format
2 parents 158e465 + 96db83a commit 2d58cdf

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

.github/bin/run-clang-format.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,7 @@
22

33
set -e
44

5-
CLANG_FORMAT=clang-format
6-
7-
# If we have preferred, more specific version, use that.
8-
if command -v clang-format-13 ; then
9-
CLANG_FORMAT=clang-format-13
10-
fi
5+
CLANG_FORMAT="${CLANG_FORMAT:-clang-format}"
116

127
FORMAT_OUT=${TMPDIR:-/tmp}/clang-format-diff.out
138

shell.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ pkgs.mkShell {
2626

2727
openslide
2828
pandoc
29-
clang-tools_17 # clang-format
29+
clang-tools_18 # clang-format
3030
];
3131
}

0 commit comments

Comments
 (0)