You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2017/06/21 18:14:33 UTC
[3/5] qpid-proton git commit: NO-JIRA: remove libuv from travis build,
use epoll default
NO-JIRA: remove libuv from travis build, use epoll default
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/538e272f
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/538e272f
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/538e272f
Branch: refs/heads/master
Commit: 538e272f636981c506c7b6893fca214a96af5c4d
Parents: bdf83cf
Author: Alan Conway <ac...@redhat.com>
Authored: Wed Jun 21 13:01:29 2017 -0400
Committer: Alan Conway <ac...@redhat.com>
Committed: Wed Jun 21 13:02:49 2017 -0400
----------------------------------------------------------------------
.travis.yml | 21 +++------------------
1 file changed, 3 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/538e272f/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index a6ad025..c4e6d93 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,9 +37,6 @@ addons:
- python3-dev
- php5
- golang
- # Libuv build requirements
- - automake
- - libtool
install:
- pip install --upgrade pip
@@ -48,22 +45,10 @@ install:
- gem install simplecov || true
- gem install minitest
-# Build and install libuv 1.0 from source, trusty only has 0.10
-- PREFIX=$PWD/install
-- git submodule add -b v1.x https://github.com/libuv/libuv
-- git submodule update --init
-- pushd libuv
-- sh autogen.sh
-- ./configure --prefix $PREFIX
-- make && make install
-- popd
-
before_script:
-- PREFIX=$PWD/install
-- export PATH=${HOME}/.local/bin:${PATH}
-- mkdir Build
-- cd Build
-- cmake .. -DCMAKE_INSTALL_PREFIX=$PREFIX ${QPID_PROTON_CMAKE_ARGS}
+- mkdir build
+- cd build
+- cmake .. -DCMAKE_INSTALL_PREFIX=$PWD/install ${QPID_PROTON_CMAKE_ARGS}
script:
- cmake --build . --target install && ctest -V ${QPID_PROTON_CTEST_ARGS}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org