Merge branch 'master' into rabbitmq-auth-backend-ldap-78

This commit is contained in:
Michael Klishin 2018-01-15 23:15:58 +03:00 committed by GitHub
commit 6e6bba80d6
1 changed files with 2 additions and 2 deletions

View File

@ -32,12 +32,12 @@ before_script:
# 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, v3.7.x branches. A branch
# We simply fetch master and, if it exists, v3.8.x branches. A branch
# is created, pointing to the detached HEAD.
- |
git checkout -B "${TRAVIS_TAG:-${TRAVIS_BRANCH}}"
git remote add upstream https://github.com/$TRAVIS_REPO_SLUG.git
git fetch upstream v3.7.x:v3.7.x || :
git fetch upstream v3.8.x:v3.8.x || :
git fetch upstream master:master || :
# Make sure we use Elixir from Erlang Solutions and not kiex.
- |