From 24289d2bb798b9bd6bb3a06f5a77af7dac90eae0 Mon Sep 17 00:00:00 2001 From: Cecile Robert-Michon Date: Fri, 20 Aug 2021 13:35:25 -0700 Subject: [PATCH] Add branch to release notes command in Makefile --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f018e4f952b..44eaae0c0a5 100644 --- a/Makefile +++ b/Makefile @@ -410,6 +410,9 @@ PREVIOUS_TAG ?= $(shell git describe --abbrev=0 $(RELEASE_TAG)^ 2>/dev/null) RELEASE_DIR ?= out GIT_REPO_NAME ?= cluster-api-provider-azure GIT_ORG_NAME ?= kubernetes-sigs +FULL_VERSION := $(RELEASE_TAG:v%=%) +MINOR_VERSION := $(shell v='$(FULL_VERSION)'; echo "$${v%.*}") +RELEASE_BRANCH ?= release-$(MINOR_VERSION) $(RELEASE_DIR): mkdir -p $(RELEASE_DIR)/ @@ -453,7 +456,7 @@ release-binary: $(RELEASE_DIR) .PHONY: release-notes release-notes: $(RELEASE_NOTES) - $(RELEASE_NOTES) --org $(GIT_ORG_NAME) --repo $(GIT_REPO_NAME) --start-rev $(PREVIOUS_TAG) --end-rev $(RELEASE_TAG) --output release-notes-$(RELEASE_TAG).md + $(RELEASE_NOTES) --org $(GIT_ORG_NAME) --repo $(GIT_REPO_NAME) --branch $(RELEASE_BRANCH) --start-rev $(PREVIOUS_TAG) --end-rev $(RELEASE_TAG) --output release-notes-$(RELEASE_TAG).md ## -------------------------------------- ## Development