From 0f436537172cd83b194fbb86e7ce218cfe6c2024 Mon Sep 17 00:00:00 2001 From: Pavel Safronov Date: Wed, 18 Mar 2026 09:07:15 -0700 Subject: [PATCH 1/6] doc(NODE-7479): clarified backport instructions --- etc/notes/releasing.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/etc/notes/releasing.md b/etc/notes/releasing.md index 464464fcf14..4e71dc5cb38 100644 --- a/etc/notes/releasing.md +++ b/etc/notes/releasing.md @@ -30,9 +30,11 @@ Fixes are usually released in either the next patch version or in the next minor release-please automatically tags release commits with a tag in the format v... When backporting, first determine the target minor version and create a release branch for it by branching off of the release tag. The release branch should follow the format `v..x`. For example, to create a backport of bson's 6.5 release, create a release branch from the v6.5.0 tag with the name v6.5.x. -Then, backport the release action to the target release branch. First, create a copy of our current release action (release.yml). Then, change any references to `main` to the target branch. Double check that there isn't any release tooling on main that doesn't exist on the target branch. If there is, make sure this is backported too. Check if the target branch has a release-please config and manifest file. If not, make sure to adopt changes for release-please v4 (see https://github.com/mongodb/js-bson/pull/682 as an example). Backport all of the above changes to the target release branch. +Then, backport the release action to the target release branch. This should be done as the first PR on the release branch. -Now, the release-please will work the same as `main`. Any PRs that merge to the release branch trigger the release action and update release-pleases' release PR. Proceed as normal from here. +First, create a copy of our current release action (release.yml). Then, change any references to `main` to the target branch. Double check that there isn't any release tooling on main that doesn't exist on the target branch. If there is, make sure this is backported too. Check if the target branch has a release-please config and manifest file. If not, make sure to adopt changes for release-please v4 (see https://github.com/mongodb/js-bson/pull/682 as an example). Backport all of the above changes to the target release branch and open a PR. + +Once the release action PR is merged, release-please will work on this branch in the same was as it does on `main`. Any PRs that merge to the release branch trigger the release action and update release-pleases' release PR. Proceed as normal from here. ## `release-please` From 7716153ebc11207d98f87bf0c0580250b580ca52 Mon Sep 17 00:00:00 2001 From: Pavel Safronov Date: Wed, 18 Mar 2026 10:07:34 -0700 Subject: [PATCH 2/6] pr feedback Co-authored-by: Daria Pardue --- etc/notes/releasing.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/notes/releasing.md b/etc/notes/releasing.md index 4e71dc5cb38..b09c21e7367 100644 --- a/etc/notes/releasing.md +++ b/etc/notes/releasing.md @@ -30,7 +30,7 @@ Fixes are usually released in either the next patch version or in the next minor release-please automatically tags release commits with a tag in the format v... When backporting, first determine the target minor version and create a release branch for it by branching off of the release tag. The release branch should follow the format `v..x`. For example, to create a backport of bson's 6.5 release, create a release branch from the v6.5.0 tag with the name v6.5.x. -Then, backport the release action to the target release branch. This should be done as the first PR on the release branch. +Then, backport the release action to the target release branch. This should be done as the first PR on the release branch. Use the following instructions to create it. First, create a copy of our current release action (release.yml). Then, change any references to `main` to the target branch. Double check that there isn't any release tooling on main that doesn't exist on the target branch. If there is, make sure this is backported too. Check if the target branch has a release-please config and manifest file. If not, make sure to adopt changes for release-please v4 (see https://github.com/mongodb/js-bson/pull/682 as an example). Backport all of the above changes to the target release branch and open a PR. From 6dcc9fb9d7bf5a224121cf54755ee1597f3b5256 Mon Sep 17 00:00:00 2001 From: Pavel Safronov Date: Wed, 18 Mar 2026 10:08:10 -0700 Subject: [PATCH 3/6] pr feedback Co-authored-by: Daria Pardue --- etc/notes/releasing.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/notes/releasing.md b/etc/notes/releasing.md index b09c21e7367..be958cb1224 100644 --- a/etc/notes/releasing.md +++ b/etc/notes/releasing.md @@ -32,7 +32,7 @@ release-please automatically tags release commits with a tag in the format v Date: Wed, 18 Mar 2026 10:12:03 -0700 Subject: [PATCH 4/6] copilot feedback Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- etc/notes/releasing.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/notes/releasing.md b/etc/notes/releasing.md index be958cb1224..64469a5445a 100644 --- a/etc/notes/releasing.md +++ b/etc/notes/releasing.md @@ -32,7 +32,7 @@ release-please automatically tags release commits with a tag in the format v Date: Wed, 18 Mar 2026 10:12:51 -0700 Subject: [PATCH 5/6] copilot feedback Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- etc/notes/releasing.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/notes/releasing.md b/etc/notes/releasing.md index 64469a5445a..abbb337e669 100644 --- a/etc/notes/releasing.md +++ b/etc/notes/releasing.md @@ -34,7 +34,7 @@ Then, backport the release action to the target release branch. This should be d First, create a copy of our current release action (release.yml). Then, change any references to `main` to the target branch. Double check that there isn't any release tooling on `main` that doesn't exist on the target branch. If there is, make sure this is backported too. After opening the PR, check the CI to make sure everything works as expected: add backports of CI fixes as needed. -Once the release action PR is merged, release-please will work on this branch in the same was as it does on `main`. Any PRs that merge to the release branch trigger the release action and update release-pleases' release PR. Proceed as normal from here. +Once the release action PR is merged, release-please will work on this branch in the same was as it does on `main`. Any PRs that merge to the release branch trigger the release action and update the release PR that release-please manages. Proceed as normal from here. ## `release-please` From a10061fb52b02b03e7ef7b9cdc9859067eb25804 Mon Sep 17 00:00:00 2001 From: Pavel Safronov Date: Wed, 18 Mar 2026 10:53:33 -0700 Subject: [PATCH 6/6] pr feedback Co-authored-by: Daria Pardue --- etc/notes/releasing.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/notes/releasing.md b/etc/notes/releasing.md index abbb337e669..fe5703c9a5d 100644 --- a/etc/notes/releasing.md +++ b/etc/notes/releasing.md @@ -34,7 +34,7 @@ Then, backport the release action to the target release branch. This should be d First, create a copy of our current release action (release.yml). Then, change any references to `main` to the target branch. Double check that there isn't any release tooling on `main` that doesn't exist on the target branch. If there is, make sure this is backported too. After opening the PR, check the CI to make sure everything works as expected: add backports of CI fixes as needed. -Once the release action PR is merged, release-please will work on this branch in the same was as it does on `main`. Any PRs that merge to the release branch trigger the release action and update the release PR that release-please manages. Proceed as normal from here. +Once the release action PR is merged, release-please will work on this branch in the same way as it does on `main`. Any PRs that merge to the release branch trigger the release action and update the release PR that release-please manages. Proceed as normal from here. ## `release-please`