-
Notifications
You must be signed in to change notification settings - Fork 526
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.
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
release: support 8.x releases #14392
Conversation
This pull request does not have a backport label. Could you fix it @v1v? 🙏
|
|
…-with-main * upstream/main: (100 commits) feat: bump beats to current main (elastic#14781) build(deps): bump github.com/elastic/elastic-agent-client/v7 from 7.16.0 to 7.17.0 (elastic#14757) PGO: Update default.pgo from benchmarks https://github.com/elastic/apm-server/actions/runs/12024199004/attempts/1. (elastic#14734) build(deps): bump slackapi/slack-github-action from 1.27.0 to 2.0.0 in the github-actions group (elastic#14656) build(deps): bump the otel group with 3 updates (elastic#14746) build(deps): bump the otel group across 1 directory with 4 updates (elastic#14681) testing: remove missing Make target dep (elastic#14523) build(deps): bump the dependencies group in /systemtest with 3 updates (elastic#14731) build(deps): bump chainguard/static in /packaging/docker (elastic#14732) build(deps): bump github.com/stretchr/testify from 1.9.0 to 1.10.0 (elastic#14733) chore: Update to elastic/beats@4278366ab032 (elastic#14725) changelog: add 8.15.5 entry (elastic#14720) chore: Update to elastic/beats@06ba17caf9ed (elastic#14711) Surface config parsing error under EA managed mode (elastic#14574) release-automation: update changelog template to add bug fixes section (elastic#14693) PGO: Update default.pgo from benchmarks https://github.com/elastic/apm-server/actions/runs/11946993444/attempts/1. (elastic#14699) changelog: add changelog entry for 8.16.1 (elastic#14690) chore: Update k8s stack yaml files (elastic#14686) docs: update release doc around documentation PR (elastic#14694) terraform: Use non-deprecated deployment template (elastic#14682) ...
@@ -115,30 +115,57 @@ endef | |||
# | |||
.PHONY: minor-release | |||
minor-release: | |||
@echo "INFO: Create GitHub label backport for the version $(RELEASE_VERSION)" | |||
$(MAKE) create-github-label NAME=backport-$(RELEASE_BRANCH) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Even though the GH label creation happens somewhere else, let's force the backport to be created just in case. This will be later on used for the docs
PR to be backported from main
to 8.x
and the new minor branch.
(cherry picked from commit 2698e80)
(cherry picked from commit 2698e80) Co-authored-by: Victor Martinez <[email protected]>
Motivation/summary
8.x
is the base branch for running the releases from.main
should be updated with the changelogs when a new minor and the mergify snippet.For such, we are gonna use the
backport
merge policy withMergify
and create the PR tomain
with thebackport-8.minor
label, so once it's merged it will be backported automatically to the new minor branch.This might be a bit chicken:egg problem, since the PR in main contains the changes in Mergify, but I expert Mergify to be clever enough to apply the new changes and the create the PR automatically....
Otherwise, we might need to create two PRs:
So the first one needs to be merged first and the second one after.
Test
Given this PR, let's run the minor-release target using my forked repository for the hypothetical release of
8.18.0
.And it created three PRs:
NOTE: I had to sync-up
8.x
with the changes of this PR.Checklist
For functional changes, consider:
How to test these changes
Related issues