diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh index be0f1cab796e..5504e8090038 100755 --- a/ci/docker/runtime_functions.sh +++ b/ci/docker/runtime_functions.sh @@ -718,7 +718,8 @@ sanity_cpp() { } sanity_clang() { - set -ex + set -e + set +x # .github/workgflows/greetings.yml passes BASE_SHA, GITHUB_RUN_ID, GITHUB_BASE_REF for pull requests. BASE_SHA="${GITHUB_PR_BASE_SHA}" GITHUB_RUN_ID="${GITHUB_PR_RUN_ID}" @@ -741,14 +742,14 @@ sanity_clang() { git remote remove "${GITHUB_RUN_ID}" # temporary remote is removed exit 0 fi - + echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" - echo "| clang-format failures found! Run: " - echo "| tool/lint/clang_format_ci.sh ${BASE_SHA} " + echo "| Clang-format failures found! Run: " + echo "| tools/lint/clang_format_ci.sh ${BASE_SHA} " echo "| to fix this error. " - echo "| For more info, see: " + echo "| For more info, see: https://mxnet.apache.org/versions/master/community/clang_format_guide" echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" - + echo "$GIT_DIFFERENCE" git remote remove "${GITHUB_RUN_ID}" # temporary remote is removed exit 1 diff --git a/tools/lint/clang_format_ci.sh b/tools/lint/clang_format_ci.sh index 41823b45e757..1031f81cf78a 100755 --- a/tools/lint/clang_format_ci.sh +++ b/tools/lint/clang_format_ci.sh @@ -16,5 +16,5 @@ # under the License. #!/bin/sh -set -eux +set -eu tools/lint/git-clang-format-13 --verbose "$1" --