Skip to content

Commit ed1b37a

Browse files
committed
Update rabbitmq-components.mk
1 parent d440aaf commit ed1b37a

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

rabbitmq-components.mk

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,11 +200,17 @@ export current_rmq_ref
200200

201201
ifeq ($(origin base_rmq_ref),undefined)
202202
ifneq ($(wildcard .git),)
203+
possible_base_rmq_ref := v3.7.x
204+
ifeq ($(possible_base_rmq_ref),$(current_rmq_ref))
205+
base_rmq_ref := $(current_rmq_ref)
206+
else
203207
base_rmq_ref := $(shell \
204-
(git rev-parse --verify -q stable >/dev/null && \
205-
git merge-base --is-ancestor $$(git merge-base master HEAD) stable && \
206-
echo stable) || \
208+
(git rev-parse --verify -q master >/dev/null && \
209+
git rev-parse --verify -q $(possible_base_rmq_ref) >/dev/null && \
210+
git merge-base --is-ancestor $$(git merge-base master HEAD) $(possible_base_rmq_ref) && \
211+
echo $(possible_base_rmq_ref)) || \
207212
echo master)
213+
endif
208214
else
209215
base_rmq_ref := master
210216
endif

0 commit comments

Comments
 (0)