Skip to content

[8.19] (backport #20843) Fix patch release workflow version#20851

Merged
ericywl merged 2 commits into8.19from
mergify/bp/8.19/pr-20843
Apr 13, 2026
Merged

[8.19] (backport #20843) Fix patch release workflow version#20851
ericywl merged 2 commits into8.19from
mergify/bp/8.19/pr-20843

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Apr 8, 2026

Motivation/summary

  • Fix patch release workflow to take in to-be-released version, but use bumped version for update PRs.
  • Remove changelog PRs from workflow, since we create them manually.
  • Remove update-version-makefile since it is no longer used.

How to test these changes

Run the workflow.

Example: https://github.com/elastic/apm-server/actions/runs/24068944954.

Related issues

Closes #20731.

This is an automatic backport of pull request #20843 done by [Mergify](https://mergify.com).

@mergify mergify bot added the backport label Apr 8, 2026
@mergify mergify bot requested a review from a team as a code owner April 8, 2026 10:45
@mergify mergify bot added conflicts There is a conflict in the backported pull request backport labels Apr 8, 2026
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Apr 8, 2026

Cherry-pick of 2b87820 has failed:

On branch mergify/bp/8.19/pr-20843
Your branch is up to date with 'origin/8.19'.

You are currently cherry-picking commit 2b87820c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/run-patch-release.yml
	both modified:   release.mk

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot assigned ericywl Apr 8, 2026
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Apr 8, 2026

🤖 GitHub comments

Just comment with:

  • run docs-build : Re-trigger the docs validation. (use unformatted text in the comment!)

@mergify mergify bot mentioned this pull request Apr 8, 2026
Merged
@ericywl ericywl closed this Apr 8, 2026
@ericywl ericywl reopened this Apr 8, 2026
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Apr 13, 2026

This pull request has not been merged yet. Could you please review and merge it @ericywl? 🙏

@mergify mergify bot added the queued label Apr 13, 2026
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Apr 13, 2026 •
edited
Loading

Merge Queue Status

This pull request spent 2 minutes 13 seconds in the queue, with no time running CI.

Waiting for:

  • check-success=lint
  • check-success=system-test
  • check-success=test (macos-latest)
  • check-success=test (windows-2025)
  • any of:
    • check-neutral = lint
    • check-skipped = lint
    • check-success = lint
  • any of:
    • check-neutral = buildkite/docs-build-pr
    • check-skipped = buildkite/docs-build-pr
    • check-success = buildkite/docs-build-pr
All conditions

Reason

The pull request #20851 has been manually updated

Hint

If you want to requeue this pull request, you can post a @mergifyio queue comment.

mergify bot added a commit that referenced this pull request Apr 13, 2026
@mergify
Merge of #20851
9d9c32c
@mergify mergify bot mentioned this pull request Apr 13, 2026
Closed
41 tasks
ericywl and others added 2 commits April 13, 2026 13:14
@ericywl
Fix patch release workflow version (#20843)
c01a209 
* Fix patch release workflow version

* Add outputs to bump-patch step

* Use BUMP_VERSION for branch name and remove unnecessary update-version-makefile

* Remove ref from checkout

* Restore update-version-makefile for minor release

* Move bump-version job to step

* Update workflow description for version input

* Fix stale comment

(cherry picked from commit 2b87820)

# Conflicts:
#	.github/workflows/run-patch-release.yml
#	release.mk
@ericywl
Fix conflicts
883cf45
@ericywl ericywl force-pushed the mergify/bp/8.19/pr-20843 branch from 840bc65 to 883cf45 Compare April 13, 2026 05:14
@ericywl ericywl enabled auto-merge (squash) April 13, 2026 05:14
@mergify mergify bot removed the queued label Apr 13, 2026
@ericywl ericywl merged commit 512f6d1 into 8.19 Apr 13, 2026
15 of 18 checks passed
@ericywl ericywl deleted the mergify/bp/8.19/pr-20843 branch April 13, 2026 05:17
@elasticmachine
Copy link
Copy Markdown
Collaborator

elasticmachine commented Apr 13, 2026

💚 Build Succeeded

History

cc @ericywl

@github-actions github-actions bot mentioned this pull request Apr 13, 2026
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ericywl ericywl ericywl approved these changes

Assignees

@ericywl ericywl

Labels

backport conflicts There is a conflict in the backported pull request

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@elasticmachine @ericywl