Skip to content

Update check_format.py to clang-format-12 #20372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattklein123 merged 1 commit into from
Mar 16, 2022
Merged

Update check_format.py to clang-format-12 #20372

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions tools/code_format/check_format.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
"./api/bazel/envoy_http_archive.bzl",
)

CLANG_FORMAT_PATH = os.getenv("CLANG_FORMAT", "clang-format-11")
CLANG_FORMAT_PATH = os.getenv("CLANG_FORMAT", "clang-format-12")
BUILDIFIER_PATH = paths.get_buildifier()
BUILDOZER_PATH = paths.get_buildozer()
ENVOY_BUILD_FIXER_PATH = os.path.join(
Expand Down Expand Up @@ -348,13 +348,13 @@ def check_tools(self):
"users".format(CLANG_FORMAT_PATH))
else:
error_messages.append(
"Command {} not found. If you have clang-format in version 10.x.x "
"Command {} not found. If you have clang-format in version 12.x.x "
"installed, but the binary name is different or it's not available in "
"PATH, please use CLANG_FORMAT environment variable to specify the path. "
"Examples:\n"
" export CLANG_FORMAT=clang-format-11.0.1\n"
" export CLANG_FORMAT=/opt/bin/clang-format-11\n"
" export CLANG_FORMAT=/usr/local/opt/llvm@11/bin/clang-format".format(
" export CLANG_FORMAT=clang-format-12.0.1\n"
" export CLANG_FORMAT=/opt/bin/clang-format-12\n"
" export CLANG_FORMAT=/usr/local/opt/llvm@12/bin/clang-format".format(
CLANG_FORMAT_PATH))

def check_bazel_tool(name, path, var):
Expand Down