diff options
| -rw-r--r-- | .travis.yml | 23 | ||||
| -rw-r--r-- | packaging/debs/Debian/debian/control | 9 |
2 files changed, 19 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml index 48146e2978..233aa0eb04 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,18 +13,25 @@ otp_release: - "18.3" env: matrix: - - GROUP=1 GROUP=2 + - GROUP=1 + - GROUP=2 -# The checkout made by Travis is a "detached HEAD". We switch back -# to a tag or a branch. This pleases our git_rmq fetch method in -# rabbitmq-components.mk and the proper tag/branch is selected in -# dependencies too. +# The checkout made by Travis is a "detached HEAD" and branches +# information is missing. Our Erlang.mk's git_rmq fetch method relies on +# it, so we need to restore it. +# +# We simply fetch master and, if it exists, stable branches. A branch is +# created, pointing to the detached HEAD. before_script: - - ([ "${GROUP}" = "1" ] && ((test "$TRAVIS_TAG" && git checkout "$TRAVIS_TAG") || (test "$TRAVIS_BRANCH" && git checkout "$TRAVIS_BRANCH")) || /bin/true) + - | + git checkout -B "${TRAVIS_TAG:-${TRAVIS_BRANCH}}" + git remote add upstream https://github.com/$TRAVIS_REPO_SLUG.git + git fetch upstream stable:stable || : + git fetch upstream master:master || : script: - - ([ "${GROUP}" = "1" ] && travis_wait make tests) - - ([ "${GROUP}" = "2" ] && sh ./scripts/travis_test_ocf_ra.sh) + - if test "${GROUP}" = '1'; then make tests CT_OPTS+='-verbosity 50'; fi + - if test "${GROUP}" = '2'; then sh ./scripts/travis_test_ocf_ra.sh; fi cache: apt: true diff --git a/packaging/debs/Debian/debian/control b/packaging/debs/Debian/debian/control index 29ea81049c..050051ba3f 100644 --- a/packaging/debs/Debian/debian/control +++ b/packaging/debs/Debian/debian/control @@ -2,10 +2,9 @@ Source: rabbitmq-server Section: net Priority: extra Maintainer: RabbitMQ Team <info@rabbitmq.com> -Uploaders: Alvaro Videla <alvaro@rabbitmq.com>, - Michael Klishin <michael@rabbitmq.com>, - Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com>, - Giuseppe Privitera <giuseppe@rabbitmq.com> +Uploaders: Michael Klishin <michael@rabbitmq.com>, + Karl Nilsson <knilsson@rabbitmq.com>, + Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> Build-Depends: debhelper (>= 9), dh-systemd (>= 1.5), erlang-dev, @@ -19,7 +18,7 @@ Standards-Version: 3.9.4 Package: rabbitmq-server Architecture: all -Depends: erlang-nox (>= 1:16.b.3) | esl-erlang, adduser, logrotate, socat, ${misc:Depends} +Depends: erlang-nox (>= 1:16.b.3) | esl-erlang, adduser, logrotate, socat, init-system-helpers (>= 1.13~) Description: Multi-protocol messaging broker RabbitMQ is an open source multi-protocol messaging broker. Homepage: http://www.rabbitmq.com/ |