diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 75d475824..f52bf2892 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -53,7 +53,7 @@ clang_format: - master before_script: - apt-get update - - apt-get install --yes --no-install-recommends git clang-format-11 + - apt-get install --yes --no-install-recommends git clang-format-13 script: - - find . \( -name "*.cpp" -or -name "*.h" -or -name "*.c" -or -name "*.cc" \) -exec clang-format-11 -i {} \; + - find . \( -name "*.cpp" -or -name "*.h" -or -name "*.c" -or -name "*.cc" \) -exec clang-format-13 -i {} \; - git diff --exit-code diff --git a/README.clang-format b/README.clang-format index 19d1038dc..90f17dc62 100644 --- a/README.clang-format +++ b/README.clang-format @@ -7,7 +7,7 @@ To get the clang-format warnings locally instead at CI time we recommend you to copy the hooks/pre-commit to your .git cp hooks/pre-commit .git/hooks/ -We are using clang-format 11 on CI. Unfortunately clang-format is not totally +We are using clang-format 13 on CI. Unfortunately clang-format is not totally compatible with older versions of itself. If CI gives you trouble but your local clang-format disagrees, just apply the changes suggested by CI and then commit with the --no-verify flag. If you get stuck, don't hesitate to ask the reviewer diff --git a/core/document.cpp b/core/document.cpp index d827970d0..a4a08cb36 100644 --- a/core/document.cpp +++ b/core/document.cpp @@ -48,13 +48,13 @@ #include #include +#include #include #include #include #include #include #include -#include #include #include #include