diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 420411d894b0383c1fcc52794de46bc1735f625b..2e28bba057cd9a2141514c4f1acfa75353c242df 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -75,7 +75,7 @@ Before contributing please remember to run: ``` This will check all C/C++ files in the tree for style issues. To check C++ -files you have to have clang-format version 6.0, otherwise they will be +files you have to have clang-format version 9.0, otherwise they will be skipped. If you want to run this target automatically at build time, you can pass CSTYLEON=1 to make. If you want cstyle to be run, but not fail the build, pass CSTYLEON=2 to make. diff --git a/utils/style_check.sh b/utils/style_check.sh index c9d44e2a7b76692e402335ef5e6b09dbaa046a95..37a09b9ac453256d6ecf021080f410ca0cd6af5c 100755 --- a/utils/style_check.sh +++ b/utils/style_check.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # SPDX-License-Identifier: BSD-3-Clause -# Copyright 2016-2020, Intel Corporation +# Copyright 2016-2022, Intel Corporation # # utils/style_check.sh -- common style checking script # @@ -12,6 +12,9 @@ CLANG_ARGS=() FLAKE8_ARGS=() CHECK_TYPE=$1 +# When updating, please search for all references to "clang-format" and update +# them as well; at this time these are CONTRIBUTING.md src/common.inc and +# docker images. [ -z "$clang_format_bin" ] && which clang-format-9 >/dev/null && clang_format_bin=clang-format-9 [ -z "$clang_format_bin" ] && which clang-format >/dev/null &&