未验证 提交 3a8aac35 编写于 作者: zhouweiwei2014's avatar zhouweiwei2014 提交者: GitHub

fix ci (#48730)

上级 c2f15f05
...@@ -99,6 +99,10 @@ set PYTHON_VENV_ROOT=%cache_dir%\python_venv ...@@ -99,6 +99,10 @@ set PYTHON_VENV_ROOT=%cache_dir%\python_venv
set PYTHON_EXECUTABLE=!PYTHON_VENV_ROOT!\Scripts\python.exe set PYTHON_EXECUTABLE=!PYTHON_VENV_ROOT!\Scripts\python.exe
%PYTHON_ROOT%\python.exe -m venv --clear !PYTHON_VENV_ROOT! %PYTHON_ROOT%\python.exe -m venv --clear !PYTHON_VENV_ROOT!
call !PYTHON_VENV_ROOT!\Scripts\activate.bat call !PYTHON_VENV_ROOT!\Scripts\activate.bat
if %ERRORLEVEL% NEQ 0 (
echo activate python virtual environment failed!
exit /b 5
)
if "%WITH_PYTHON%" == "ON" ( if "%WITH_PYTHON%" == "ON" (
where python where python
...@@ -640,7 +644,6 @@ pip uninstall -y paddlepaddle ...@@ -640,7 +644,6 @@ pip uninstall -y paddlepaddle
pip uninstall -y paddlepaddle-gpu pip uninstall -y paddlepaddle-gpu
pip install %PADDLE_WHL_FILE_WIN% pip install %PADDLE_WHL_FILE_WIN%
if %ERRORLEVEL% NEQ 0 ( if %ERRORLEVEL% NEQ 0 (
call paddle_winci\Scripts\deactivate.bat 2>NUL
echo pip install whl package failed! echo pip install whl package failed!
exit /b 1 exit /b 1
) )
......
...@@ -1008,9 +1008,8 @@ function generate_upstream_develop_api_spec() { ...@@ -1008,9 +1008,8 @@ function generate_upstream_develop_api_spec() {
cmake_change=`git diff --name-only upstream/$BRANCH | grep "cmake/external" || true` cmake_change=`git diff --name-only upstream/$BRANCH | grep "cmake/external" || true`
cd ${PADDLE_ROOT} cd ${PADDLE_ROOT}
git fetch upstream $BRANCH
git checkout -b develop_base_pr -t 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 git log --pretty=oneline -10
dev_commit=`git log -1|head -1|awk '{print $2}'` dev_commit=`git log -1|head -1|awk '{print $2}'`
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册