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

ci(release-minor): add apm- prefix and create release diff between patches #13065

Merged
merged 6 commits into from
May 7, 2024
Merged

ci(release-minor): add apm- prefix and create release diff between patches #13065

Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
463ee6b
ci(release): update heading creation and compare with semver
v1v May 2, 2024
d2eabe8
revert
v1v May 2, 2024
4656d7f
support for diff between patches
v1v May 2, 2024
55d1fbf
use a different approach
v1v May 2, 2024
1bd70a3
Merge branch 'main' into feature/update-docs-automation-for-releases
v1v May 6, 2024
9f3ffbc
Merge branch 'main' into feature/update-docs-automation-for-releases
v1v May 7, 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
10 changes: 6 additions & 4 deletions release.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ PROJECT_PATCH_VERSION ?= $(shell echo $(RELEASE_VERSION) | cut -f3 -d.)
PROJECT_OWNER ?= elastic
RELEASE_TYPE ?= minor

CURRENT_RELEASE ?= $(shell gh api repos/elastic/apm-server/releases/latest | jq -r '.tag_name|sub("v"; ""; "")')
CURRENT_RELEASE ?= $(shell gh release list --exclude-drafts --exclude-pre-releases --limit 10 --json tagName --jq '.[].tagName|select(. | startswith("v$(PROJECT_MAJOR_VERSION)"))' | sed 's|v||g' | sort -r | head -n 1)
Copy link
Member Author

@v1v v1v May 2, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We cannot use latest as long as latest can point to 7.17. I've already reported to the release team (Only accessible by Elastic employees)

image

I decided to use a different approach and filter by the major version and do some manipulation

RELEASE_BRANCH ?= $(PROJECT_MAJOR_VERSION).$(PROJECT_MINOR_VERSION)
NEXT_PROJECT_MINOR_VERSION ?= $(PROJECT_MAJOR_VERSION).$(shell expr $(PROJECT_MINOR_VERSION) + 1).0
NEXT_RELEASE ?= $(RELEASE_BRANCH).$(shell expr $(PROJECT_PATCH_VERSION) + 1)
Expand Down Expand Up @@ -140,8 +140,8 @@ rename-changelog:
$(MAKE) common-changelog
@echo ">> rename-changelog"
echo "$$CHANGELOG_TMPL" > changelogs/head.asciidoc
@if ! grep -q 'release-notes-$(VERSION)' CHANGELOG.asciidoc ; then \
awk "NR==2{print \"* <<release-notes-$(VERSION)>>\"}1" CHANGELOG.asciidoc > CHANGELOG.asciidoc.new; \
@if ! grep -q 'apm-release-notes-$(VERSION)' CHANGELOG.asciidoc ; then \
awk "NR==2{print \"* <<apm-release-notes-$(VERSION)>>\"}1" CHANGELOG.asciidoc > CHANGELOG.asciidoc.new; \
mv CHANGELOG.asciidoc.new CHANGELOG.asciidoc ; \
fi
@if ! grep -q '$(VERSION).asciidoc' CHANGELOG.asciidoc ; then \
Expand All @@ -165,7 +165,9 @@ common-changelog:
mv changelogs/head.asciidoc changelogs/$(VERSION).asciidoc
$(SED) 's#head#$(VERSION)#gI' changelogs/$(VERSION).asciidoc
$(SED) -E -e 's#(\...)main#\1$(VERSION)#g' changelogs/$(VERSION).asciidoc
awk "NR==5{print \"\n* <<release-notes-$(VERSION).0>>\n\n[float]\n[[release-notes-$(VERSION).0]]\n=== APM version $(VERSION).0\"}1" changelogs/$(VERSION).asciidoc > changelogs/$(VERSION).asciidoc.new
$(SED) 's#https://github.com/elastic/apm-server/compare/.*##gI' changelogs/$(VERSION).asciidoc
v1v marked this conversation as resolved.
Show resolved Hide resolved
$(SED) 's#\[\[release-notes#\[\[apm-release-notes#gI' changelogs/$(VERSION).asciidoc
awk "NR==5{print \"\n* <<apm-release-notes-$(VERSION).0>>\n\n[float]\n[[apm-release-notes-$(VERSION).0]]\n=== APM version $(VERSION).0\n\nhttps://github.com/elastic/apm-server/compare/v$(CURRENT_RELEASE)\...v$(VERSION).0[View commits]\"}1" changelogs/$(VERSION).asciidoc > changelogs/$(VERSION).asciidoc.new
mv changelogs/$(VERSION).asciidoc.new changelogs/$(VERSION).asciidoc

## Update the references on .mergify.yml with the new minor release.
Expand Down
Loading