root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Update rabbitmq-components.mk

This commit is contained in:
Jean-Sébastien Pédron 2017-11-28 13:25:40 +01:00
parent 26d05370ba
commit 5fd00b3275
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
deps/rabbitmq_auth_backend_cache/rabbitmq-components.mk vendored
View File

@ -200,11 +200,17 @@ export current_rmq_ref
ifeq ($(origin base_rmq_ref),undefined) ifeq ($(origin base_rmq_ref),undefined)
ifneq ($(wildcard .git),) ifneq ($(wildcard .git),)
possible_base_rmq_ref := v3.7.x
ifeq ($(possible_base_rmq_ref),$(current_rmq_ref))
base_rmq_ref := $(current_rmq_ref)
else
base_rmq_ref := $(shell \ base_rmq_ref := $(shell \
(git rev-parse --verify -q stable >/dev/null && \ (git rev-parse --verify -q master >/dev/null && \
git merge-base --is-ancestor $$(git merge-base master HEAD) stable && \ git rev-parse --verify -q $(possible_base_rmq_ref) >/dev/null && \
echo stable) || \ git merge-base --is-ancestor $$(git merge-base master HEAD) $(possible_base_rmq_ref) && \
echo $(possible_base_rmq_ref)) || \
echo master) echo master)
endif
else else
base_rmq_ref := master base_rmq_ref := master
endif endif