From 4f593c7fca9f68df74533da359389be82900f1c9 Mon Sep 17 00:00:00 2001 From: jbajic Date: Wed, 2 Mar 2022 17:22:37 +0100 Subject: [PATCH] Adapt precommit to run through all files --- .githooks/pre-commit | 14 +++++++++----- src/communication/context.cpp | 1 + src/lisp/test.lisp | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.githooks/pre-commit b/.githooks/pre-commit index f9e017bff..a39f1bd04 100755 --- a/.githooks/pre-commit +++ b/.githooks/pre-commit @@ -16,6 +16,7 @@ tmpdir=$(mktemp -d repo-XXXXXXXX) trap "rm -rf $tmpdir" EXIT INT modified_files=$(git diff --cached --name-only --diff-filter=AM $against | sed -nE "/.*\.(cpp|cc|cxx|c|h|hpp)$/p") +FAIL=0 for file in $modified_files; do echo "Checking $file..." @@ -25,17 +26,20 @@ for file in $modified_files; do echo "Running clang-format..." $project_folder/tools/git-clang-format $tmpdir/$file - code=$? + CODE=$? - if [ $code -ne 0 ]; then + if [ $CODE -ne 0 ]; then break fi + # Do not break header checker echo "Running header checker..." $project_folder/tools/header-checker.py $tmpdir/$file $file --amend-year - code=$? - # Do not break header checker + CODE=$? + if [ $CODE -ne 0 ]; then + FAIL=1 + fi done; -return $code +return $((CODE || FAIL)) diff --git a/src/communication/context.cpp b/src/communication/context.cpp index fc74bb0df..b3e58824b 100644 --- a/src/communication/context.cpp +++ b/src/communication/context.cpp @@ -99,6 +99,7 @@ ServerContext::ServerContext(const std::string &key_file, const std::string &cer if (verify_peer) { // Enable verification of the client certificate. + // NOLINTNEXTLINE(hicpp-signed-bitwise) ctx_->set_verify_mode(boost::asio::ssl::verify_peer | boost::asio::ssl::verify_fail_if_no_peer_cert, ec); MG_ASSERT(!ec, "Setting SSL verification mode failed!"); } diff --git a/src/lisp/test.lisp b/src/lisp/test.lisp index 852101372..548599f69 100644 --- a/src/lisp/test.lisp +++ b/src/lisp/test.lisp @@ -1000,4 +1000,4 @@ CPP-TYPE-DECL." "object.member_ = member_;") (single-member-test (member "UnknownClass") "object.member_ = member_;") - (undefine-cpp-types)))) \ No newline at end of file + (undefine-cpp-types))))