Skip to content

Commit 4a5dd62

Browse files
authored
Try to add build_android task back to travis. (#8699)
1 parent 92974d4 commit 4a5dd62

File tree

4 files changed

+9
-35
lines changed

4 files changed

+9
-35
lines changed

.travis.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,17 @@ cache:
44
- $HOME/.ccache
55
- $HOME/.cache/pip
66
- $TRAVIS_BUILD_DIR/build/third_party
7+
- $TRAVIS_BUILD_DIR/build_android/third_party
78
sudo: required
89
dist: trusty
10+
services:
11+
- docker
912
os:
1013
- linux
1114
env:
1215
- JOB=build_doc
1316
- JOB=check_style
17+
- JOB=build_android
1418
addons:
1519
apt:
1620
packages:
@@ -41,8 +45,10 @@ before_install:
4145
function timeout() { perl -e 'alarm shift; exec @ARGV' "$@"; }
4246
script:
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;

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ include_directories("${CMAKE_CURRENT_BINARY_DIR}/go/pserver/client/c")
168168
set(EXTERNAL_LIBS
169169
gflags
170170
glog
171-
cblas
171+
${CBLAS_LIBRARIES}
172172
protobuf
173173
zlib
174174
${PYTHON_LIBRARIES}

paddle/scripts/docker/build_android.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ ${ANDROID_NDK_HOME}/build/tools/make-standalone-toolchain.sh \
3131
BUILD_ROOT=/paddle/build_android
3232
DEST_ROOT=/paddle/install_android
3333

34-
rm -rf $BUILD_ROOT 2>/dev/null || true
3534
mkdir -p $BUILD_ROOT
3635
cd $BUILD_ROOT
3736

paddle/scripts/travis/build_android.sh

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)