Skip to content

Version bump idempotency #21555

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

Open
ninalee12 wants to merge 9 commits into
base: main
Choose a base branch
from
+31 −31
Open

Version bump idempotency #21555

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e494eb5
Unify branch existence validation in prepare-release action
fr4nc1sc0-r4m0n Jul 3, 2026
278cfb9
Use github.repository in prepare-release branch check
fr4nc1sc0-r4m0n Jul 3, 2026
d5ad1cb
add minor and patch checks for idempotency
ninalee12 Jul 21, 2026
e499214
move branch check one layer lower
ninalee12 Jul 21, 2026
6283362
rearranged the logic in the create-pull-request target
ninalee12 Jul 21, 2026
5408240
move existing branch guard to create-branch
ninalee12 Jul 22, 2026
15c15b6
update PR count check in create-pull-request target to filter by bran…
ninalee12 Jul 22, 2026
31a92d3
update comment for create-branch
ninalee12 Jul 22, 2026
0df40c1
Merge branch 'main' into version-bump-idempotency
ninalee12 Jul 29, 2026
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
24 changes: 0 additions & 24 deletions .github/workflows/prepare-release/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,30 +73,6 @@ runs:
echo "::error::${FAILURE_MESSAGE}" ; exit 1
shell: 'bash'

- name: validate if branch already exists (major only)
if: ${{ inputs.type == 'major' }}
run: |-
if git ls-remote --exit-code --heads "https://github.com/${GITHUB_REPOSITORY}.git" "$BRANCH" > /dev/null ; then
echo "FAILURE_MESSAGE=${FAILURE_MESSAGE}" >> "$GITHUB_ENV"
echo "::error::${FAILURE_MESSAGE}" ; exit 1
fi
shell: 'bash'
env:
BRANCH: ${{ steps.generate.outputs.release-branch }}
FAILURE_MESSAGE: Branch already exists. This is not a major release.

- name: validate if branch already exists (minor only)
if: ${{ inputs.type == 'minor' }}
run: |-
if git ls-remote --exit-code --heads https://github.com/${{ github.repository }}.git "$BRANCH" > /dev/null ; then
FAILURE_MESSAGE='Branch already exists. This is not a minor release.'
echo "FAILURE_MESSAGE=${FAILURE_MESSAGE}" >> "$GITHUB_ENV"
echo "::error::${FAILURE_MESSAGE}" ; exit 1
fi
shell: 'bash'
env:
BRANCH: ${{ steps.generate.outputs.release-branch }}

- name: validate if tag already exists
run: |-
if git ls-remote --exit-code https://github.com/${{ github.repository }}.git "$TAG" > /dev/null ; then
Expand Down
72 changes: 41 additions & 31 deletions release.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ PROJECT_MINOR_VERSION ?= $(shell echo $(RELEASE_VERSION) | cut -f2 -d.)
PROJECT_PATCH_VERSION ?= $(shell echo $(RELEASE_VERSION) | cut -f3 -d.)
PROJECT_OWNER ?= elastic
RELEASE_TYPE ?= minor
FORCE_PR_CREATION ?=

# if gh is installed only
ifneq ($(shell command -v gh 2>/dev/null),)
Expand Down Expand Up @@ -72,26 +73,27 @@ endif
#
.PHONY: minor-release
minor-release:
@echo "INFO: Create GitHub label backport for the version $(RELEASE_VERSION)"
$(MAKE) create-github-label NAME=backport-$(RELEASE_BRANCH)

@echo "INFO: Create release branch and update new version $(RELEASE_VERSION)"
$(MAKE) create-branch NAME=$(RELEASE_BRANCH) BASE=$(BASE_BRANCH)
$(MAKE) update-version VERSION=$(RELEASE_VERSION)
$(MAKE) update-version-makefile VERSION=$(PROJECT_MAJOR_VERSION)\.$(PROJECT_MINOR_VERSION)
$(MAKE) create-commit COMMIT_MESSAGE="[Release] update version $(RELEASE_VERSION)"

@echo "INFO: Create feature branch and update the versions. Target branch $(BASE_BRANCH)"
$(MAKE) create-branch NAME=update-$(RELEASE_VERSION) BASE=$(BASE_BRANCH)
$(MAKE) update-mergify VERSION=$(RELEASE_BRANCH)
$(MAKE) update-version VERSION=$(NEXT_PROJECT_MINOR_VERSION)
$(MAKE) create-commit COMMIT_MESSAGE="[Release] update version $(NEXT_PROJECT_MINOR_VERSION)"
$(MAKE) update-changelog VERSION=$(RELEASE_VERSION)
$(MAKE) create-commit COMMIT_MESSAGE="[Release] update changelogs for $(RELEASE_BRANCH) release"

@echo "INFO: Push changes to $(PROJECT_OWNER)/apm-server and create the relevant Pull Requests"
git push origin $(RELEASE_BRANCH)
$(MAKE) create-pull-request BRANCH=update-$(RELEASE_VERSION) TARGET_BRANCH=$(BASE_BRANCH) TITLE="$(RELEASE_BRANCH): update docs, mergify, versions and changelogs" BODY="Merge as soon as the GitHub checks are green."
@if git ls-remote --exit-code --heads https://github.com/$(PROJECT_OWNER)/apm-server.git "$(RELEASE_BRANCH)" > /dev/null 2>&1; then \
Comment thread
ninalee12 marked this conversation as resolved.
Outdated
echo "WARNING: Release branch $(RELEASE_BRANCH) already exists. Skipping." ; \
else \
echo "INFO: Create GitHub label backport for the version $(RELEASE_VERSION)" ; \
$(MAKE) create-github-label NAME=backport-$(RELEASE_BRANCH) ; \
echo "INFO: Create release branch and update new version $(RELEASE_VERSION)" ; \
$(MAKE) create-branch NAME=$(RELEASE_BRANCH) BASE=$(BASE_BRANCH) ; \
$(MAKE) update-version VERSION=$(RELEASE_VERSION) ; \
$(MAKE) update-version-makefile VERSION=$(PROJECT_MAJOR_VERSION)\.$(PROJECT_MINOR_VERSION) ; \
$(MAKE) create-commit COMMIT_MESSAGE="[Release] update version $(RELEASE_VERSION)" ; \
echo "INFO: Create feature branch and update the versions. Target branch $(BASE_BRANCH)" ; \
$(MAKE) create-branch NAME=update-$(RELEASE_VERSION) BASE=$(BASE_BRANCH) ; \
$(MAKE) update-mergify VERSION=$(RELEASE_BRANCH) ; \
$(MAKE) update-version VERSION=$(NEXT_PROJECT_MINOR_VERSION) ; \
$(MAKE) create-commit COMMIT_MESSAGE="[Release] update version $(NEXT_PROJECT_MINOR_VERSION)" ; \
$(MAKE) update-changelog VERSION=$(RELEASE_VERSION) ; \
$(MAKE) create-commit COMMIT_MESSAGE="[Release] update changelogs for $(RELEASE_BRANCH) release" ; \
echo "INFO: Push changes to $(PROJECT_OWNER)/apm-server and create the relevant Pull Requests" ; \
git push origin $(RELEASE_BRANCH) ; \
$(MAKE) create-pull-request BRANCH=update-$(RELEASE_VERSION) TARGET_BRANCH=$(BASE_BRANCH) TITLE="$(RELEASE_BRANCH): update docs, mergify, versions and changelogs" BODY="Merge as soon as the GitHub checks are green." ; \
fi

# This is the contract with the GitHub action .github/workflows/run-major-release.yml.
# The GitHub action will provide the below environment variables:
Expand Down Expand Up @@ -211,17 +213,25 @@ create-pull-request: BRANCH=$${BRANCH} TITLE=$${TITLE} TARGET_BRANCH=$${TARGET_B

create-pull-request:
@echo "::group::create-pull-request $(BRANCH) -> $(TARGET_BRANCH)"
git push origin $(BRANCH)
echo "--label $(BACKPORT_LABEL)"
gh pr create \
--title "$(TITLE)" \
--body "$(BODY)" \
--base $(TARGET_BRANCH) \
--head $(BRANCH) \
--label 'release' \
--label "$(BACKPORT_LABEL)" \
--reviewer "$(PROJECT_REVIEWERS)" \
--repo $(PROJECT_OWNER)/apm-server || echo "There is no changes"
@PR_COUNT=0 ; \
if [ "$(FORCE_PR_CREATION)" != "true" ]; then \
PR_COUNT=$$(gh pr list --head "$(BRANCH)" --base "$(TARGET_BRANCH)" --label release --state all --json number --jq 'length' --repo $(PROJECT_OWNER)/apm-server) ; \
fi ; \
if [ "$$PR_COUNT" -gt 0 ]; then \
echo "PR for $(BRANCH) -> $(TARGET_BRANCH) already exists, skipping." ; \
else \
echo "--label $(BACKPORT_LABEL)" ; \
git push origin $(BRANCH) ; \
gh pr create \
--title "$(TITLE)" \
--body "$(BODY)" \
--base $(TARGET_BRANCH) \
--head $(BRANCH) \
--label 'release' \
--label "$(BACKPORT_LABEL)" \
--reviewer "$(PROJECT_REVIEWERS)" \
--repo $(PROJECT_OWNER)/apm-server || echo "There is no changes" ; \
fi
@echo "::endgroup::"

## Diff output
Expand Down
Loading