SINGA-345 Update Jenkins and fix bugs in compliation fix bug due to that apt-get of ubuntu 14.04 installs old protobuf 2.5
update the installation of dependent libs on osx for travis Project: http://git-wip-us.apache.org/repos/asf/incubator-singa/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-singa/commit/163452e7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/163452e7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/163452e7 Branch: refs/heads/master Commit: 163452e743d0fc1cff707ca64ed8747c2bb73739 Parents: 95b535d Author: wang wei <wang...@comp.nus.edu.sg> Authored: Fri Apr 6 09:23:33 2018 +0700 Committer: wang wei <wang...@comp.nus.edu.sg> Committed: Fri Apr 6 09:50:12 2018 +0700 ---------------------------------------------------------------------- tool/travis/build.sh | 2 +- tool/travis/depends.sh | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/163452e7/tool/travis/build.sh ---------------------------------------------------------------------- diff --git a/tool/travis/build.sh b/tool/travis/build.sh index e59a1cc..f6c0308 100644 --- a/tool/travis/build.sh +++ b/tool/travis/build.sh @@ -26,7 +26,7 @@ then cmake -DUSE_CUDA=OFF -DUSE_PYTHON=OFF -DENABLE_TEST=ON -DProtobuf_PROTOC_EXECUTABLE=/usr/local/opt/protobuf/bin/protoc ..; else mkdir build && cd build; - cmake -DUSE_CUDA=OFF -DUSE_PYTHON=OFF -DENABLE_TEST=ON .. + cmake -DUSE_CUDA=OFF -DUSE_PYTHON=OFF -DENABLE_TEST=ON -DUSE_MODULES=ON .. fi make; ./bin/test_singa --gtest_output=xml:./../gtest.xml; http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/163452e7/tool/travis/depends.sh ---------------------------------------------------------------------- diff --git a/tool/travis/depends.sh b/tool/travis/depends.sh index a90cdd4..7e4bf41 100644 --- a/tool/travis/depends.sh +++ b/tool/travis/depends.sh @@ -21,11 +21,12 @@ if [[ "$TRAVIS_SECURE_ENV_VARS" == "false" ]]; then if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then - sudo apt-get -qq update; - sudo apt-get -qq -y install libopenblas-dev libprotobuf-dev protobuf-compiler; + echo "nothing to install" +# sudo apt-get -qq update; +# sudo apt-get -qq -y install libopenblas-dev libprotobuf-dev protobuf-compiler; else brew update; - brew tap homebrew/science; + # brew tap homebrew/science; brew install openblas protobuf; fi else
