Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[7.17] ci(release): support for releases from 8.x (backport #14028) #14039

Merged
merged 2 commits into from
Sep 11, 2024
Merged

[7.17] ci(release): support for releases from 8.x (backport #14028) #14039

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4582e24
ci(release): support for releases from 8.x (#14028)
v1v Sep 11, 2024
3ba9fb0
Merge branch '7.17' into mergify/bp/7.17/pr-14028
mergify[bot] Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions release.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand Down Expand Up @@ -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; \
Expand Down
Loading