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

fix CI sccache install dir (#46267)

上级 32c6ce2d
...@@ -116,7 +116,6 @@ if "%WITH_PYTHON%" == "ON" ( ...@@ -116,7 +116,6 @@ if "%WITH_PYTHON%" == "ON" (
rem -------Caching strategy 1: keep build directory for incremental compilation----------- rem -------Caching strategy 1: keep build directory for incremental compilation-----------
rmdir %BUILD_DIR%\python /s/q rmdir %BUILD_DIR%\python /s/q
rmdir %BUILD_DIR%\paddle\third_party\externalError /s/q rmdir %BUILD_DIR%\paddle\third_party\externalError /s/q
rem rmdir %BUILD_DIR%\paddle\fluid\pybind /s/q
rmdir %BUILD_DIR%\paddle_install_dir /s/q rmdir %BUILD_DIR%\paddle_install_dir /s/q
rmdir %BUILD_DIR%\paddle_inference_install_dir /s/q rmdir %BUILD_DIR%\paddle_inference_install_dir /s/q
rmdir %BUILD_DIR%\paddle_inference_c_install_dir /s/q rmdir %BUILD_DIR%\paddle_inference_c_install_dir /s/q
...@@ -172,14 +171,16 @@ echo ipipe_log_param_Windows_Build_Cache: %Windows_Build_Cache% ...@@ -172,14 +171,16 @@ echo ipipe_log_param_Windows_Build_Cache: %Windows_Build_Cache%
cd /d %BUILD_DIR% cd /d %BUILD_DIR%
dir . dir .
dir %cache_dir% dir %cache_dir%
dir paddle\fluid\pybind\Release
rem -------Caching strategy 1: End -------------------------------- rem -------Caching strategy 1: End --------------------------------
rem -------Caching strategy 2: sccache decorate compiler----------- rem -------Caching strategy 2: sccache decorate compiler-----------
if not defined SCCACHE_ROOT set SCCACHE_ROOT=D:\sccache if not defined SCCACHE_ROOT set SCCACHE_ROOT=D:\sccache
set PATH=%SCCACHE_ROOT%;%PATH%
if "%WITH_SCCACHE%"=="ON" ( if "%WITH_SCCACHE%"=="ON" (
cmd /C sccache -V || call :install_sccache cmd /C sccache -V || call :install_sccache
cmd /C sccache -V || echo install sccache failed!
sccache --stop-server 2> NUL sccache --stop-server 2> NUL
del %SCCACHE_ROOT%\sccache_log.txt del %SCCACHE_ROOT%\sccache_log.txt
...@@ -203,7 +204,7 @@ if "%WITH_SCCACHE%"=="ON" ( ...@@ -203,7 +204,7 @@ if "%WITH_SCCACHE%"=="ON" (
sccache -z sccache -z
goto :CASE_%1 goto :CASE_%1
) else ( ) else (
del %PYTHON_ROOT%\sccache.exe 2> NUL del %SCCACHE_ROOT%\sccache.exe 2> NUL
goto :CASE_%1 goto :CASE_%1
) )
...@@ -211,7 +212,7 @@ if "%WITH_SCCACHE%"=="ON" ( ...@@ -211,7 +212,7 @@ if "%WITH_SCCACHE%"=="ON" (
echo There is not sccache in this PC, will install sccache. echo There is not sccache in this PC, will install sccache.
echo Download package from https://paddle-ci.gz.bcebos.com/window_requirement/sccache.exe echo Download package from https://paddle-ci.gz.bcebos.com/window_requirement/sccache.exe
%PYTHON_ROOT%\python.exe -c "import wget;wget.download('https://paddle-ci.gz.bcebos.com/window_requirement/sccache.exe')" %PYTHON_ROOT%\python.exe -c "import wget;wget.download('https://paddle-ci.gz.bcebos.com/window_requirement/sccache.exe')"
xcopy sccache.exe %PYTHON_ROOT%\ /Y xcopy sccache.exe %SCCACHE_ROOT%\ /Y
del sccache.exe del sccache.exe
goto:eof goto:eof
rem -------Caching strategy 2: End -------------------------------- rem -------Caching strategy 2: End --------------------------------
......
...@@ -994,12 +994,13 @@ function generate_upstream_develop_api_spec() { ...@@ -994,12 +994,13 @@ function generate_upstream_develop_api_spec() {
mkdir -p ${PADDLE_ROOT}/build/pr_whl && mv ${PADDLE_ROOT}/build/python/dist/*.whl ${PADDLE_ROOT}/build/pr_whl/ mkdir -p ${PADDLE_ROOT}/build/pr_whl && mv ${PADDLE_ROOT}/build/python/dist/*.whl ${PADDLE_ROOT}/build/pr_whl/
echo "pr_whl_size: ${pr_whl_size}" echo "pr_whl_size: ${pr_whl_size}"
rm -rf ${PADDLE_ROOT}/build/Makefile ${PADDLE_ROOT}/build/CMakeCache.txt ${PADDLE_ROOT}/build/python/paddle rm -rf ${PADDLE_ROOT}/build/Makefile ${PADDLE_ROOT}/build/CMakeCache.txt ${PADDLE_ROOT}/build/python
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 checkout . git fetch upstream $BRANCH
git checkout -b develop_base_pr upstream/$BRANCH git checkout -b develop_base_pr -t upstream/$BRANCH
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}'`
dev_url="https://xly-devops.bj.bcebos.com/PR/build_whl/0/${dev_commit}/paddlepaddle_gpu-0.0.0-cp37-cp37m-linux_x86_64.whl" dev_url="https://xly-devops.bj.bcebos.com/PR/build_whl/0/${dev_commit}/paddlepaddle_gpu-0.0.0-cp37-cp37m-linux_x86_64.whl"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册