diff --git a/.travis.yml b/.travis.yml index 7de4ec7fc511832998cd0dc053645e52136042b8..5b14f8e61e6143bb22a3aad5e0a9b11688b1b4be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,10 +29,6 @@ addons: - python-pip - python2.7-dev - m4 - - libprotobuf-dev - - doxygen - - protobuf-compiler - - python-protobuf - python-numpy - python-wheel - libgoogle-glog-dev @@ -43,6 +39,8 @@ addons: - graphviz - swig - clang-format-3.8 + - automake + - libtool before_install: - | if [ ${JOB} == "BUILD_AND_TEST" ]; then diff --git a/cmake/check_packages.cmake b/cmake/check_packages.cmake index 06887455418797f7162a5970669a0483e42a2db8..1a7c6a791bf26e378defb9a7882f5e93cf7745de 100644 --- a/cmake/check_packages.cmake +++ b/cmake/check_packages.cmake @@ -28,7 +28,6 @@ endif() if(WITH_DOC) find_package(Sphinx REQUIRED) - find_package(Doxygen REQUIRED) find_python_module(recommonmark REQUIRED) endif() diff --git a/paddle/scripts/travis/before_install.linux.sh b/paddle/scripts/travis/before_install.linux.sh index ec2ac1f2240765d1c453ce50ec44286a551a37ba..3351deddb971b48960f95439668627944300cb14 100755 --- a/paddle/scripts/travis/before_install.linux.sh +++ b/paddle/scripts/travis/before_install.linux.sh @@ -1,5 +1,16 @@ #!/bin/bash set -e + +cd /tmp +wget https://github.com/google/protobuf/archive/v3.0.2.tar.gz -O protobuf.tar.gz +tar xf protobuf.tar.gz +cd protobuf* +./autogen.sh +./configure +make -j 2 install +cd .. +rm -rf protobuf* + pushd /usr/src/gtest cmake . make diff --git a/paddle/scripts/travis/main.sh b/paddle/scripts/travis/main.sh index 13f2552d29db38041a73edca0acd202945c67484..1b49a12563d370815cc6d55b6e19a0f52caf17a8 100755 --- a/paddle/scripts/travis/main.sh +++ b/paddle/scripts/travis/main.sh @@ -1,6 +1,11 @@ #!/bin/bash cd `dirname $0` +if [ "$TRAVIS_OS_NAME" == "linux" ]; then + # for manually installed protobuf 3.10 + export LD_LIBRARY_PATH=/usr/local/lib/:$LD_LIBRARY_PATH +fi + if [ ${JOB} == "BUILD_AND_TEST" ]; then ./build_and_test.sh elif [ ${JOB} == "DOCS" ]; then