diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2017-11-28 12:46:43 +0100 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2017-11-28 12:46:43 +0100 |
| commit | ed1b37a4f0756009c195ac03b2d22351df5a79a6 (patch) | |
| tree | dc8498a945c664f4a4cab01feec6838d5da7ce94 | |
| parent | d440aaf25743b3305ac4dacfd7e8f0c3881c3941 (diff) | |
| download | rabbitmq-server-git-ed1b37a4f0756009c195ac03b2d22351df5a79a6.tar.gz | |
Update rabbitmq-components.mk
| -rw-r--r-- | rabbitmq-components.mk | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/rabbitmq-components.mk b/rabbitmq-components.mk index 9567477aa0..48f26b9f46 100644 --- a/rabbitmq-components.mk +++ b/rabbitmq-components.mk @@ -200,11 +200,17 @@ export current_rmq_ref ifeq ($(origin base_rmq_ref),undefined) 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 \ - (git rev-parse --verify -q stable >/dev/null && \ - git merge-base --is-ancestor $$(git merge-base master HEAD) stable && \ - echo stable) || \ + (git rev-parse --verify -q master >/dev/null && \ + git rev-parse --verify -q $(possible_base_rmq_ref) >/dev/null && \ + git merge-base --is-ancestor $$(git merge-base master HEAD) $(possible_base_rmq_ref) && \ + echo $(possible_base_rmq_ref)) || \ echo master) +endif else base_rmq_ref := master endif |