From 4582e24287f4fa01c287bfc96091b80140aeebd8 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 11 Sep 2024 11:29:57 +0200 Subject: [PATCH] ci(release): support for releases from 8.x (#14028) (cherry picked from commit 0c92c81dd6c176edd7d7a296f80314ded15cae35) --- release.mk | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/release.mk b/release.mk index b86cda3b827..5099ddf139d 100644 --- a/release.mk +++ b/release.mk @@ -46,9 +46,16 @@ NEXT_RELEASE ?= $(RELEASE_BRANCH).$(shell expr $(PROJECT_PATCH_VERSION) + 1) BRANCH_PATCH = update-$(NEXT_RELEASE) +# for the view commits +# as long as 8.x is the branch to run releases, then the base branch is 8.x +# when 8.x is not available the we should use main as the base branch. +CHANGELOG_BRANCH = 8.x + # BASE_BRANCH select by release type (default patch) ifeq ($(RELEASE_TYPE),minor) - BASE_BRANCH ?= main +# as long as 8.x is the branch to run releases, then the base branch is 8.x +# when 8.x is not available the we should use main as the base branch. + BASE_BRANCH ?= 8.x endif ifeq ($(RELEASE_TYPE),patch) @@ -64,7 +71,7 @@ define CHANGELOG_TMPL [[release-notes-head]] == APM version HEAD -https://github.com/elastic/apm-server/compare/$(RELEASE_BRANCH)\...main[View commits] +https://github.com/elastic/apm-server/compare/$(RELEASE_BRANCH)\...$(CHANGELOG_BRANCH)[View commits] [float] ==== Breaking Changes @@ -201,7 +208,7 @@ update-mergify: echo ' - name: backport patches to $(VERSION) branch' >> .mergify.yml ; \ echo ' conditions:' >> .mergify.yml; \ echo ' - merged' >> .mergify.yml; \ - echo ' - base=main' >> .mergify.yml; \ + echo ' - base=8.x' >> .mergify.yml; \ echo ' - label=backport-$(VERSION)' >> .mergify.yml; \ echo ' actions:' >> .mergify.yml; \ echo ' backport:' >> .mergify.yml; \