From c42c66f9538dd40a564c09e568487b17fd8f0602 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 23 Oct 2025 15:38:09 +0000 Subject: [PATCH 1/3] Initial plan From 77f08ef29123f22187e22e1860dc929ed63d7855 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 23 Oct 2025 15:45:18 +0000 Subject: [PATCH 2/3] Fix patch release to use NEXT_RELEASE instead of RELEASE_VERSION Co-authored-by: isaacaflores2 <34590010+isaacaflores2@users.noreply.github.com> --- release.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/release.mk b/release.mk index 7d2c5300f3f..7a9beed48c5 100644 --- a/release.mk +++ b/release.mk @@ -112,12 +112,12 @@ major-release: patch-release: @echo "INFO: Create feature branch and update the versions. Target branch $(RELEASE_BRANCH)" $(MAKE) create-branch NAME=$(BRANCH_PATCH) BASE=$(RELEASE_BRANCH) - $(MAKE) update-version VERSION=$(RELEASE_VERSION) + $(MAKE) update-version VERSION=$(NEXT_RELEASE) $(MAKE) update-version-makefile VERSION=$(PROJECT_MAJOR_VERSION)\.$(PROJECT_MINOR_VERSION) $(MAKE) update-version-legacy VERSION=$(NEXT_RELEASE) PREVIOUS_VERSION=$(CURRENT_RELEASE) - $(MAKE) create-commit COMMIT_MESSAGE="$(RELEASE_BRANCH): update versions to $(RELEASE_VERSION)" + $(MAKE) create-commit COMMIT_MESSAGE="$(RELEASE_BRANCH): update versions to $(NEXT_RELEASE)" @echo "INFO: Push changes to $(PROJECT_OWNER)/apm-server and create the relevant Pull Requests" - $(MAKE) create-pull-request BRANCH=$(BRANCH_PATCH) TARGET_BRANCH=$(RELEASE_BRANCH) TITLE="$(RELEASE_VERSION): update versions" BODY="Merge on request by the Release Manager." BACKPORT_LABEL=backport-skip + $(MAKE) create-pull-request BRANCH=$(BRANCH_PATCH) TARGET_BRANCH=$(RELEASE_BRANCH) TITLE="$(NEXT_RELEASE): update versions" BODY="Merge on request by the Release Manager." BACKPORT_LABEL=backport-skip @echo "INFO: Create feature branch and update the versions. Target branch $(BASE_BRANCH)" $(MAKE) create-branch NAME=update-$(RELEASE_VERSION) BASE=$(BASE_BRANCH) From 4801b58c4511a360ba6e0ef6708022b22a212930 Mon Sep 17 00:00:00 2001 From: Isaac Flores Date: Mon, 10 Nov 2025 11:47:30 -0800 Subject: [PATCH 3/3] Change patch release branch name from 'update-' to 'bump-to-next-patch-' --- release.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.mk b/release.mk index 7a9beed48c5..b0a9c4ee808 100644 --- a/release.mk +++ b/release.mk @@ -45,7 +45,7 @@ CURRENT_RELEASE ?= $(shell gh release list --exclude-drafts --exclude-pre-releas 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) -BRANCH_PATCH = update-$(NEXT_RELEASE) +BRANCH_PATCH = bump-to-next-patch-$(NEXT_RELEASE) endif # BASE_BRANCH select by release type (default patch)