diff --git a/paddle/scripts/paddle_build.bat b/paddle/scripts/paddle_build.bat index 254b268b958b2e89030c0ccf41b1f6b88670a683..0163946682400a56d8e8f30235083b95ee0c8f47 100644 --- a/paddle/scripts/paddle_build.bat +++ b/paddle/scripts/paddle_build.bat @@ -99,6 +99,10 @@ set PYTHON_VENV_ROOT=%cache_dir%\python_venv set PYTHON_EXECUTABLE=!PYTHON_VENV_ROOT!\Scripts\python.exe %PYTHON_ROOT%\python.exe -m venv --clear !PYTHON_VENV_ROOT! call !PYTHON_VENV_ROOT!\Scripts\activate.bat +if %ERRORLEVEL% NEQ 0 ( + echo activate python virtual environment failed! + exit /b 5 +) if "%WITH_PYTHON%" == "ON" ( where python @@ -640,7 +644,6 @@ pip uninstall -y paddlepaddle pip uninstall -y paddlepaddle-gpu pip install %PADDLE_WHL_FILE_WIN% if %ERRORLEVEL% NEQ 0 ( - call paddle_winci\Scripts\deactivate.bat 2>NUL echo pip install whl package failed! exit /b 1 ) diff --git a/paddle/scripts/paddle_build.sh b/paddle/scripts/paddle_build.sh index 4e563496d3529050ae9e5edb19b11ae05a265857..71facd96950689f34be6cf9294b73d2b453fbe60 100755 --- a/paddle/scripts/paddle_build.sh +++ b/paddle/scripts/paddle_build.sh @@ -1008,9 +1008,8 @@ function generate_upstream_develop_api_spec() { cmake_change=`git diff --name-only upstream/$BRANCH | grep "cmake/external" || true` cd ${PADDLE_ROOT} - git fetch upstream $BRANCH git checkout -b develop_base_pr -t upstream/$BRANCH - echo "upstream develop git log: " + echo "develop git log: " git log --pretty=oneline -10 dev_commit=`git log -1|head -1|awk '{print $2}'`