diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-12-06 13:12:18 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-12-06 13:26:53 +0100 |
| commit | 49f4860ce3e4122e17c869229701f7d86aa6956c (patch) | |
| tree | 27c9dc9a7f00663854def367f6d085604ff98e20 /misc | |
| parent | 2f73a059cefadcd944b6874f2557ec82e46a562d (diff) | |
| download | redot-engine-49f4860ce3e4122e17c869229701f7d86aa6956c.tar.gz | |
Style: Mark clang-format 16 as supported for pre-commit hook
It only introduced a difference in a .glsl file, which I've worked
around by removing an empty line. This keeps formatting consistent
between clang-format 15 and 16.
Also added a change in the 3-to-4 project converter to fix bogus
formatting in clang-format < 17.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/hooks/README.md | 2 | ||||
| -rwxr-xr-x | misc/hooks/pre-commit-clang-format | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/misc/hooks/README.md b/misc/hooks/README.md index 0aaeff8ae3..573f8fe350 100644 --- a/misc/hooks/README.md +++ b/misc/hooks/README.md @@ -29,7 +29,7 @@ so they should work out of the box on Linux/macOS. ##### clang-format - Download LLVM for Windows (version 13 or later) from - <https://releases.llvm.org/download.html> + <https://github.com/llvm/llvm-project/releases> - Make sure LLVM is added to the `PATH` during installation ##### black diff --git a/misc/hooks/pre-commit-clang-format b/misc/hooks/pre-commit-clang-format index fd0213c175..e5cf0c4aa2 100755 --- a/misc/hooks/pre-commit-clang-format +++ b/misc/hooks/pre-commit-clang-format @@ -80,7 +80,7 @@ fi # To get consistent formatting, we recommend contributors to use the same # clang-format version as CI. RECOMMENDED_CLANG_FORMAT_MAJOR_MIN="13" -RECOMMENDED_CLANG_FORMAT_MAJOR_MAX="15" +RECOMMENDED_CLANG_FORMAT_MAJOR_MAX="16" if [ ! -x "$CLANG_FORMAT" ] ; then message="Error: clang-format executable not found. Please install clang-format $RECOMMENDED_CLANG_FORMAT_MAJOR_MAX." |