From 24e395f62a60b5766f804ca6f19deaca9f5766e6 Mon Sep 17 00:00:00 2001 From: risemeup1 <62429225+risemeup1@users.noreply.github.com> Date: Thu, 2 Feb 2023 16:29:48 +0800 Subject: [PATCH] fix build_ci bug,test=docuement_fix (#46467) --- paddle/scripts/paddle_build.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/paddle/scripts/paddle_build.sh b/paddle/scripts/paddle_build.sh index d389b76cfe..5e222198fa 100644 --- a/paddle/scripts/paddle_build.sh +++ b/paddle/scripts/paddle_build.sh @@ -3481,10 +3481,7 @@ function build_pr_and_develop() { generate_api_spec "$1" "PR" mkdir ${PADDLE_ROOT}/build/pr_whl && cp ${PADDLE_ROOT}/build/python/dist/*.whl ${PADDLE_ROOT}/build/pr_whl rm -f ${PADDLE_ROOT}/build/python/dist/*.whl && rm -f ${PADDLE_ROOT}/build/python/build/.timestamp - if [[ ${cmake_change} ]];then - rm -rf ${PADDLE_ROOT}/build/Makefile ${PADDLE_ROOT}/build/CMakeCache.txt - rm -rf ${PADDLE_ROOT}/build/third_party - fi + git fetch upstream develop git checkout develop @@ -3495,6 +3492,10 @@ function build_pr_and_develop() { mkdir ${PADDLE_ROOT}/build/dev_whl && wget -q -P ${PADDLE_ROOT}/build/dev_whl ${dev_url} cp ${PADDLE_ROOT}/build/dev_whl/paddlepaddle_gpu-0.0.0-cp37-cp37m-linux_x86_64.whl ${PADDLE_ROOT}/build/python/dist else + if [[ ${cmake_change} ]];then + rm -rf ${PADDLE_ROOT}/build/Makefile ${PADDLE_ROOT}/build/CMakeCache.txt + rm -rf ${PADDLE_ROOT}/build/third_party + fi git checkout -b develop_base_pr upstream/$BRANCH run_setup ${PYTHON_ABI:-""} bdist_wheel ${parallel_number} if [ ! -d "${PADDLE_ROOT}/build/python/dist/" ]; then -- GitLab