From 22a87eb1b8c99b60a31f94328da0fdca4f3d9621 Mon Sep 17 00:00:00 2001 From: kruskall <99559985+kruskall@users.noreply.github.com> Date: Wed, 20 Nov 2024 21:04:39 +0100 Subject: [PATCH] docs: update release doc around documentation PR (#14694) (cherry picked from commit c12642b3ab71112aa6eef01ebd47977070df6a3b) --- dev_docs/RELEASES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev_docs/RELEASES.md b/dev_docs/RELEASES.md index fb1aebc2089..94375c58f98 100644 --- a/dev_docs/RELEASES.md +++ b/dev_docs/RELEASES.md @@ -23,7 +23,7 @@ For patch releases, only the version on the existing major and minor version bra * Review the [changelogs/head](https://github.com/elastic/apm-server/tree/main/changelogs/head.asciidoc) file and move relevant changelog entries from `head.asciidoc` to `release_version.asciidoc` if the change is backported to release_version. If changes do not apply to the version being released, keep them in the `head.asciidoc` file. * Review the commits in the release to ensure all changes are reflected in the release notes. Check for backported changes without release notes in `release_version.asciidoc`. * Add your PR to the documentation release issue ([Sample Issue](https://github.com/elastic/dev/issues/2485)). - * The PR should only be merged on release day. + * The PR should be merged the day before release. * For **minor releases**: run the [`run-minor-release`](https://github.com/elastic/apm-server/actions/workflows/run-minor-release.yml) workflow (In "Use workflow from", select `main` branch. Then in "The version", specify the minor release version the release is for). This workflow will: create the release branch; update the changelog for the release branch and open a PR targeting the release branch titled `.: update docs`; create a PR on `main` titled `.: update docs, mergify, versions and changelogs`. Before merging them compare commits between latest minor and the new minor versions and ensure all relevant PRs have been included in the Changelog. If not, amend it in both PRs. Request and wait a PR review from the team before merging. * The Release Manager will ping the team to align the release process