diff --git a/paddle/scripts/travis/before_install.linux.sh b/paddle/scripts/travis/before_install.linux.sh index c23acfb60e817ed3068316f21318bcbb98be0fe9..9620bff6bcf77c6e87f149e8e33408170dd8e507 100755 --- a/paddle/scripts/travis/before_install.linux.sh +++ b/paddle/scripts/travis/before_install.linux.sh @@ -6,7 +6,7 @@ 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 +./configure --prefix=/usr/ make -j 2 install cd .. rm -rf protobuf* diff --git a/paddle/scripts/travis/main.sh b/paddle/scripts/travis/main.sh index 1b49a12563d370815cc6d55b6e19a0f52caf17a8..13f2552d29db38041a73edca0acd202945c67484 100755 --- a/paddle/scripts/travis/main.sh +++ b/paddle/scripts/travis/main.sh @@ -1,11 +1,6 @@ #!/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