mirror of
https://github.com/zeromq/libzmq.git
synced 2024-12-28 16:15:23 +08:00
Merge pull request #2275 from bluca/travis_pkg
This commit is contained in:
Constantin Rack
GitHub
commit
b2a2bb8609
43
.travis.yml
43
.travis.yml
@ -12,36 +12,45 @@ env:
|
||||
- BUILD_TYPE=default CURVE=tweetnacl DRAFT=enabled
|
||||
- BUILD_TYPE=android CURVE=tweetnacl
|
||||
- BUILD_TYPE=cmake CURVE=tweetnacl
|
||||
- BUILD_TYPE=default CURVE=libsodium
|
||||
- BUILD_TYPE=default
|
||||
- BUILD_TYPE=coverage CURVE=tweetnacl DRAFT=enabled
|
||||
- BUILD_TYPE=valgrind CURVE=tweetnacl DRAFT=enabled
|
||||
|
||||
matrix:
|
||||
exclude:
|
||||
- env: BUILD_TYPE=coverage CURVE=tweetnacl DRAFT=enabled
|
||||
os: osx
|
||||
- env: BUILD_TYPE=valgrind CURVE=tweetnacl DRAFT=enabled
|
||||
os: osx
|
||||
include:
|
||||
- env: BUILD_TYPE=default CURVE=tweetnacl IPv6=ON
|
||||
os: linux
|
||||
dist: precise
|
||||
sudo: false
|
||||
- env: BUILD_TYPE=coverage CURVE=tweetnacl DRAFT=enabled
|
||||
os: linux
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- lcov
|
||||
- env: BUILD_TYPE=valgrind CURVE=tweetnacl DRAFT=enabled
|
||||
os: linux
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- valgrind
|
||||
- env: BUILD_TYPE=default CURVE=libsodium
|
||||
os: linux
|
||||
addons:
|
||||
apt:
|
||||
sources:
|
||||
- sourceline: 'deb http://download.opensuse.org/repositories/home:/zeromq:/git-stable/xUbuntu_14.04/ ./'
|
||||
key_url: 'http://download.opensuse.org/repositories/home:/zeromq:/git-stable/xUbuntu_14.04/Release.key'
|
||||
packages:
|
||||
- libsodium-dev
|
||||
- asciidoc
|
||||
- xmlto
|
||||
- env: BUILD_TYPE=default CURVE=libsodium
|
||||
os: osx
|
||||
|
||||
sudo: required
|
||||
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- cmake
|
||||
- lcov
|
||||
- valgrind
|
||||
|
||||
before_install:
|
||||
- if [ $TRAVIS_OS_NAME == "osx" ] ; then brew update; brew install binutils ; fi
|
||||
# workaround for Travis OSX CI bug, hasn't been fixed in a month so time for a hack
|
||||
- if [ $TRAVIS_OS_NAME == "osx" ] ; then brew uninstall libtool && brew install libtool ; fi
|
||||
- if [ $TRAVIS_OS_NAME == "osx" -a $CURVE == "libsodium" ] ; then brew install libsodium ; fi
|
||||
|
||||
before_script:
|
||||
# ZMQ stress tests need more open socket (files) than the usual default
|
||||
|
||||
@ -23,8 +23,19 @@ if [ -z $CURVE ]; then
|
||||
elif [ $CURVE == "libsodium" ]; then
|
||||
CMAKE_OPTS+=("-DWITH_LIBSODIUM=ON")
|
||||
|
||||
git clone --depth 1 -b stable git://github.com/jedisct1/libsodium.git
|
||||
( cd libsodium; ./autogen.sh; ./configure --prefix=$BUILD_PREFIX; make install)
|
||||
if command -v dpkg-query >/dev/null 2>&1; then
|
||||
dpkg-query --list libsodium-dev >/dev/null 2>&1
|
||||
HAVE_SODIUM=$?
|
||||
elif command -v brew >/dev/null 2>&1; then
|
||||
brew ls --versions libsodium >/dev/null 2>&1
|
||||
HAVE_SODIUM=$?
|
||||
else
|
||||
HAVE_SODIUM=1
|
||||
fi
|
||||
if [ $HAVE_SODIUM -ne 0 ]; then
|
||||
git clone --depth 1 -b stable git://github.com/jedisct1/libsodium.git
|
||||
( cd libsodium; ./autogen.sh; ./configure --prefix=$BUILD_PREFIX; make check; make install)
|
||||
fi
|
||||
fi
|
||||
|
||||
# Build, check, and install from local source
|
||||
|
||||
@ -19,8 +19,19 @@ if [ -z $CURVE ]; then
|
||||
elif [ $CURVE == "libsodium" ]; then
|
||||
CMAKE_OPTS+=("-DWITH_LIBSODIUM=ON")
|
||||
|
||||
git clone --depth 1 -b stable git://github.com/jedisct1/libsodium.git
|
||||
( cd libsodium; ./autogen.sh; ./configure --prefix=$BUILD_PREFIX; make install)
|
||||
if command -v dpkg-query >/dev/null 2>&1; then
|
||||
dpkg-query --list libsodium-dev >/dev/null 2>&1
|
||||
HAVE_SODIUM=$?
|
||||
elif command -v brew >/dev/null 2>&1; then
|
||||
brew ls --versions libsodium >/dev/null 2>&1
|
||||
HAVE_SODIUM=$?
|
||||
else
|
||||
HAVE_SODIUM=1
|
||||
fi
|
||||
if [ $HAVE_SODIUM -ne 0 ]; then
|
||||
git clone --depth 1 -b stable git://github.com/jedisct1/libsodium.git
|
||||
( cd libsodium; ./autogen.sh; ./configure --prefix=$BUILD_PREFIX; make check; make install)
|
||||
fi
|
||||
fi
|
||||
|
||||
pip install --user cpp-coveralls
|
||||
|
||||
@ -19,8 +19,19 @@ if [ -z $CURVE ]; then
|
||||
elif [ $CURVE == "libsodium" ]; then
|
||||
CONFIG_OPTS+=("--with-libsodium=yes")
|
||||
|
||||
git clone --depth 1 -b stable git://github.com/jedisct1/libsodium.git
|
||||
( cd libsodium; ./autogen.sh; ./configure --prefix=$BUILD_PREFIX; make install)
|
||||
if command -v dpkg-query >/dev/null 2>&1; then
|
||||
dpkg-query --list libsodium-dev >/dev/null 2>&1
|
||||
HAVE_SODIUM=$?
|
||||
elif command -v brew >/dev/null 2>&1; then
|
||||
brew ls --versions libsodium >/dev/null 2>&1
|
||||
HAVE_SODIUM=$?
|
||||
else
|
||||
HAVE_SODIUM=1
|
||||
fi
|
||||
if [ $HAVE_SODIUM -ne 0 ]; then
|
||||
git clone --depth 1 -b stable git://github.com/jedisct1/libsodium.git
|
||||
( cd libsodium; ./autogen.sh; ./configure --prefix=$BUILD_PREFIX; make check; make install)
|
||||
fi
|
||||
fi
|
||||
|
||||
# Build, check, and install from local source
|
||||
|
||||
15
ci_build.sh
15
ci_build.sh
@ -20,8 +20,19 @@ if [ $BUILD_TYPE == "default" ]; then
|
||||
elif [ $CURVE == "libsodium" ]; then
|
||||
CONFIG_OPTS+=("--with-libsodium=yes")
|
||||
|
||||
git clone --depth 1 -b stable git://github.com/jedisct1/libsodium.git
|
||||
( cd libsodium; ./autogen.sh; ./configure --prefix=$BUILD_PREFIX; make check; make install)
|
||||
if command -v dpkg-query >/dev/null 2>&1; then
|
||||
dpkg-query --list libsodium-dev >/dev/null 2>&1
|
||||
HAVE_SODIUM=$?
|
||||
elif command -v brew >/dev/null 2>&1; then
|
||||
brew ls --versions libsodium >/dev/null 2>&1
|
||||
HAVE_SODIUM=$?
|
||||
else
|
||||
HAVE_SODIUM=1
|
||||
fi
|
||||
if [ $HAVE_SODIUM -ne 0 ]; then
|
||||
git clone --depth 1 -b stable git://github.com/jedisct1/libsodium.git
|
||||
( cd libsodium; ./autogen.sh; ./configure --prefix=$BUILD_PREFIX; make check; make install)
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -z $DRAFT ] || [ $DRAFT == "disabled" ]; then
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user