From 448cc73f92e7b7fe5e7517950034c3782ff9b2c4 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Fri, 15 Sep 2017 15:30:56 +0100 Subject: [PATCH 1/7] Update NEWS for #164 --- NEWS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NEWS b/NEWS index fcf8d8c6..81bd9e33 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,8 @@ * Fixed #2623 - ZMQ_ROUTER: with ZMQ_ROUTER_MANDATORY, ZMQ_POLLOUT will now now return true only if at least one pipe is ready for writing +* Fixed #164 - EHOSTDOWN socket error assertion + 0MQ version 4.1.6 stable, released on 2016/11/01 ================================================ From 99e027a152e7477206fc0b3b2b843b2212282486 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Fri, 15 Sep 2017 15:35:53 +0100 Subject: [PATCH 2/7] Problem: travis builds libsodium from scratch everytime Solution: use packages/brew --- .travis.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index d3c1bdfe..e2178b77 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,15 @@ os: - osx sudo: false +dist: trusty + +addons: + apt: + sources: + - sourceline: 'deb http://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-stable/xUbuntu_14.04/ ./' + key_url: 'http://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-stable/xUbuntu_14.04/Release.key' + packages: + - libsodium-dev env: global: @@ -21,13 +30,7 @@ env: before_install: # 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 - -# Build required projects first -before_script: -- mkdir tmp -# libsodium -- 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 [ $TRAVIS_OS_NAME == "osx" ] ; then brew install libsodium ; fi # ZMQ stress tests need more open socket (files) than the usual default # On OSX, it seems the way to set the max files limit is constantly changing, so From 6d57807dd0503cc4e2cb5f55dcf26076cced151f Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Fri, 15 Sep 2017 15:36:18 +0100 Subject: [PATCH 3/7] Problem: travis old brew workaround still in place Solution: remove it as it's useless now --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e2178b77..a82b157c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,8 +28,6 @@ env: - DISTCHECK_CONFIGURE_FLAGS="--with-libsodium --prefix=${BUILD_PREFIX}" before_install: -# 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" ] ; then brew install libsodium ; fi # ZMQ stress tests need more open socket (files) than the usual default From 90586290a7dea4abbdee5d9bab4f4efa6d0e6448 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Fri, 15 Sep 2017 15:37:56 +0100 Subject: [PATCH 4/7] Problem: travis job uses custom build path Solution: remove it, dependencies are in the standard path --- .travis.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index a82b157c..27b3e82b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,13 +19,7 @@ addons: env: global: - - BUILD_PREFIX=$PWD/tmp - - CFLAGS=-I${BUILD_PREFIX}/include - - CPPFLAGS=-I${BUILD_PREFIX}/include - - CXXFLAGS=-I${BUILD_PREFIX}/include - - LDFLAGS=-L${BUILD_PREFIX}/lib - - PKG_CONFIG_PATH=${BUILD_PREFIX}/lib/pkgconfig - - DISTCHECK_CONFIGURE_FLAGS="--with-libsodium --prefix=${BUILD_PREFIX}" + - DISTCHECK_CONFIGURE_FLAGS="--with-libsodium" before_install: - if [ $TRAVIS_OS_NAME == "osx" ] ; then brew install libsodium ; fi @@ -37,7 +31,7 @@ before_install: # Build and check this project script: -- ./autogen.sh && ./configure --with-libsodium --prefix=${BUILD_PREFIX} && make distcheck +- ./autogen.sh && ./configure --with-libsodium && make distcheck # Deploy tags before_deploy: From 63ed586aecfb07b06527bb44bbb24653bf99dfb2 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Fri, 15 Sep 2017 15:38:44 +0100 Subject: [PATCH 5/7] Problem: travis job fails due to unsupported ulimit setting Solution: remove it --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 27b3e82b..2f869c89 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ before_install: # ZMQ stress tests need more open socket (files) than the usual default # On OSX, it seems the way to set the max files limit is constantly changing, so # try to use all known knobs to ensure compatibility across various versions -- if [ $TRAVIS_OS_NAME == "osx" ] ; then sudo sysctl -w kern.maxfiles=64000 ; sudo sysctl -w kern.maxfilesperproc=64000 ; sudo launchctl limit maxfiles 64000 64000 ; fi ; ulimit -n 64000 +- if [ $TRAVIS_OS_NAME == "osx" ] ; then sudo sysctl -w kern.maxfiles=64000 ; sudo sysctl -w kern.maxfilesperproc=64000 ; sudo launchctl limit maxfiles 64000 64000 ; fi # Build and check this project script: From 159b511b6c5558937f31a3a44f3228077dfa091e Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Fri, 15 Sep 2017 15:42:28 +0100 Subject: [PATCH 6/7] Problem: travis OSX job does not set ulimit Solution: do it, as it's still needed for OSX --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2f869c89..b3de5797 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ before_install: # ZMQ stress tests need more open socket (files) than the usual default # On OSX, it seems the way to set the max files limit is constantly changing, so # try to use all known knobs to ensure compatibility across various versions -- if [ $TRAVIS_OS_NAME == "osx" ] ; then sudo sysctl -w kern.maxfiles=64000 ; sudo sysctl -w kern.maxfilesperproc=64000 ; sudo launchctl limit maxfiles 64000 64000 ; fi +- if [ $TRAVIS_OS_NAME == "osx" ] ; then sudo sysctl -w kern.maxfiles=64000 ; sudo sysctl -w kern.maxfilesperproc=64000 ; sudo launchctl limit maxfiles 64000 64000 ; ulimit -n 64000 ; fi # Build and check this project script: From 2a2079ef318b4024e7dd42355b178e5490a924fb Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Fri, 15 Sep 2017 15:41:38 +0100 Subject: [PATCH 7/7] Problem: doc build not tested in travis Solution: install asciidoc and xmlto to run it --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index b3de5797..41d78dc9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,8 @@ addons: key_url: 'http://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-stable/xUbuntu_14.04/Release.key' packages: - libsodium-dev + - asciidoc + - xmlto env: global: