diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index cdf600f75b4d97..d697155e808907 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -43,7 +43,7 @@ jobs: .jenkins/run-shellcheck.sh - name: Ensure correct trailing newlines run: | - (! git grep -Il '' -- . ':(exclude)**/contrib/**' ':(exclude)third_party' ':(exclude)**.expect' | tools/trailing_newlines.py || (echo "The above files do not have correct trailing newlines; please normalize them"; false)) + (! git grep -Il '' -- . ':(exclude)**/contrib/**' ':(exclude)third_party' ':(exclude)**.expect' ':(exclude)tools/clang_format_hash' | tools/trailing_newlines.py || (echo "The above files do not have correct trailing newlines; please normalize them"; false)) - name: Ensure no trailing spaces run: | (! git grep -I -no ' $' -- . ':(exclude)**/contrib/**' ':(exclude)third_party' || (echo "The above files have trailing spaces; please remove them"; false)) diff --git a/tools/clang_format_hash/linux64/clang-format-linux64 b/tools/clang_format_hash/linux64/clang-format-linux64 index 784b18bf20a29f..40a85640a2aa37 100644 --- a/tools/clang_format_hash/linux64/clang-format-linux64 +++ b/tools/clang_format_hash/linux64/clang-format-linux64 @@ -1 +1 @@ -21ca53c291a88b53dac85751b7a0203ca610ac94b7adaff3c092cf30df4168f2 +21ca53c291a88b53dac85751b7a0203ca610ac94b7adaff3c092cf30df4168f2 \ No newline at end of file diff --git a/tools/clang_format_hash/mac/clang-format-mojave b/tools/clang_format_hash/mac/clang-format-mojave index 7e4dc1402cb5f5..fe4f8f6bdd69ef 100644 --- a/tools/clang_format_hash/mac/clang-format-mojave +++ b/tools/clang_format_hash/mac/clang-format-mojave @@ -1 +1 @@ -5fde7bccf65032da297dfb1f18e4a95e96e278fa397e9dcaf364dfe23ec46353 +5fde7bccf65032da297dfb1f18e4a95e96e278fa397e9dcaf364dfe23ec46353 \ No newline at end of file diff --git a/tools/clang_format_utils.py b/tools/clang_format_utils.py index 5a883dad0c5b0e..36427ea149a127 100644 --- a/tools/clang_format_utils.py +++ b/tools/clang_format_utils.py @@ -142,6 +142,7 @@ def get_and_check_clang_format(verbose=False): # Err on the side of caution and try to delete the downloaded binary. try: os.unlink(CLANG_FORMAT_PATH) + print("The binary has been deleted just to be safe") except OSError as e: print("Failed to delete binary: {}".format(str(e))) print("Delete this binary as soon as possible and do not execute it!")