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 4
4
- $HOME/.ccache
5
5
- $HOME/.cache/pip
6
6
- $TRAVIS_BUILD_DIR/build/third_party
7
+ - $TRAVIS_BUILD_DIR/build_android/third_party
7
8
sudo : required
8
9
dist : trusty
10
+ services :
11
+ - docker
9
12
os :
10
13
- linux
11
14
env :
12
15
- JOB=build_doc
13
16
- JOB=check_style
17
+ - JOB=build_android
14
18
addons :
15
19
apt :
16
20
packages :
@@ -41,8 +45,10 @@ before_install:
41
45
function timeout() { perl -e 'alarm shift; exec @ARGV' "$@"; }
42
46
script :
43
47
- |
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;
46
52
- |
47
53
if [[ "$JOB" != "build_doc" ]]; then exit 0; fi;
48
54
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")
168
168
set (EXTERNAL_LIBS
169
169
gflags
170
170
glog
171
- cblas
171
+ ${CBLAS_LIBRARIES}
172
172
protobuf
173
173
zlib
174
174
${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 \
31
31
BUILD_ROOT=/paddle/build_android
32
32
DEST_ROOT=/paddle/install_android
33
33
34
- rm -rf $BUILD_ROOT 2> /dev/null || true
35
34
mkdir -p $BUILD_ROOT
36
35
cd $BUILD_ROOT
37
36
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments