Merge pull request PaddlePaddle#52 from mthreads/fix_build.sh

[MTAI-484] fix(ci): fix bug in build.sh
hanhaowen-mt · Aug 16, 2023 · 579d91c · 579d91c
2 parents 2bde4ba + d2601d6
commit 579d91c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -65,7 +65,7 @@ pipeline {
         container('main') {
           sh """#!/bin/bash
           cd ${env.paddle_musa_working_dir}
-          /bin/bash ci/build.sh -j64
+          /opt/conda/condabin/conda run -n py38 --no-capture-output /bin/bash ci/build.sh -j64
           """
         }
       }
@@ -78,7 +78,7 @@ pipeline {
           cd ${env.paddle_musa_working_dir}/build
           ctest -V -R system_allocator_test
           """
-          // sh '/bin/bash --login -c "cd build && ctest -V -R system_allocator_test"'
+          // sh '/bin/bash --login -c "/opt/conda/condabin/conda run -n py38 --no-capture-output cd build && ctest -V -R system_allocator_test"'
         }
       }
     }

diff --git a/ci/build.sh b/ci/build.sh
@@ -85,7 +85,7 @@ fi
 
 git diff --name-only ${ref_revision} | xargs touch
 
-find build -name "CMakeCache*" | xargs rm
+rm build -rf
 export MAX_JOBS=${MAX_JOBS}
 WITH_MKL=ON WITH_AVX=ON WITH_TESTING=ON python setup.py install 
 # WITH_MKL=ON WITH_AVX=ON PY_VERSION=3.8 /bin/bash paddle/scripts/paddle_build.sh build_only ${MAX_JOBS}