File tree Expand file tree Collapse file tree 4 files changed +9
-35
lines changed
Expand file tree Collapse file tree 4 files changed +9
-35
lines changed Original file line number Diff line number Diff line change 44 - $HOME/.ccache
55 - $HOME/.cache/pip
66 - $TRAVIS_BUILD_DIR/build/third_party
7+ - $TRAVIS_BUILD_DIR/build_android/third_party
78sudo : required
89dist : trusty
10+ services :
11+ - docker
912os :
1013 - linux
1114env :
1215 - JOB=build_doc
1316 - JOB=check_style
17+ - JOB=build_android
1418addons :
1519 apt :
1620 packages :
@@ -41,8 +45,10 @@ before_install:
4145 function timeout() { perl -e 'alarm shift; exec @ARGV' "$@"; }
4246script :
4347 - |
44- timeout 2580 paddle/scripts/travis/${JOB}.sh # 43min timeout
45- RESULT=$?; if [ $RESULT -eq 0 ] || [ $RESULT -eq 142 ]; then true ;else exit 1; fi;
48+ # 43min timeout
49+ if [[ "$JOB" == "build_android" ]]; then timeout 2580 docker run -it --rm -v "$TRAVIS_BUILD_DIR:/paddle" paddlepaddle/paddle:latest-dev-android;
50+ else timeout 2580 paddle/scripts/travis/${JOB}.sh; fi;
51+ RESULT=$?; if [ $RESULT -eq 0 ] || [ $RESULT -eq 142 ]; then true; else exit 1; fi;
4652 - |
4753 if [[ "$JOB" != "build_doc" ]]; then exit 0; fi;
4854 if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then exit 0; fi;
Original file line number Diff line number Diff line change @@ -168,7 +168,7 @@ include_directories("${CMAKE_CURRENT_BINARY_DIR}/go/pserver/client/c")
168168set (EXTERNAL_LIBS
169169 gflags
170170 glog
171- cblas
171+ ${CBLAS_LIBRARIES}
172172 protobuf
173173 zlib
174174 ${PYTHON_LIBRARIES}
Original file line number Diff line number Diff line change @@ -31,7 +31,6 @@ ${ANDROID_NDK_HOME}/build/tools/make-standalone-toolchain.sh \
3131BUILD_ROOT=/paddle/build_android
3232DEST_ROOT=/paddle/install_android
3333
34- rm -rf $BUILD_ROOT 2> /dev/null || true
3534mkdir -p $BUILD_ROOT
3635cd $BUILD_ROOT
3736
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments