Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix static check ci #48730

Merged
merged 1 commit into from
Dec 7, 2022
Merged

fix static check ci #48730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion paddle/scripts/paddle_build.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
)
Expand Down
3 changes: 1 addition & 2 deletions paddle/scripts/paddle_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}'`
Expand Down