From b0c17e7614cda3a310138acf007b7b930a215a9d Mon Sep 17 00:00:00 2001 From: tianshuo78520a <707759223@qq.com> Date: Sun, 26 Apr 2020 13:55:40 +0800 Subject: [PATCH] [CHERRY-PICK2.0]add code format (#24074) --- paddle/scripts/paddle_build.sh | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/paddle/scripts/paddle_build.sh b/paddle/scripts/paddle_build.sh index 365f6800bea..7aa85ab137e 100755 --- a/paddle/scripts/paddle_build.sh +++ b/paddle/scripts/paddle_build.sh @@ -270,20 +270,26 @@ function check_style() { eval "$(GIMME_GO_VERSION=1.8.3 gimme)" fi - pip install cpplint + pip install cpplint pylint pytest astroid isort # set up go environment for running gometalinter mkdir -p $GOPATH/src/github.com/PaddlePaddle/ ln -sf ${PADDLE_ROOT} $GOPATH/src/github.com/PaddlePaddle/Paddle - export PATH=/usr/bin:$PATH pre-commit install clang-format --version - if ! pre-commit run -a ; then - git diff + commit_files=on + for file_name in `git diff --numstat upstream/$BRANCH |awk '{print $NF}'`;do + if ! pre-commit run --files $file_name ; then + git diff + commit_files=off + fi + done + + if [ $commit_files == 'off' ];then + echo "code format error" exit 1 fi - trap : 0 } @@ -1133,6 +1139,7 @@ function main() { build ${parallel_number} ;; build_and_check) + check_style generate_upstream_develop_api_spec ${PYTHON_ABI:-""} ${parallel_number} cmake_gen ${PYTHON_ABI:-""} build ${parallel_number} -- GitLab