From 2be6a32295aa4a67f0313c42943330dfb622cf4d Mon Sep 17 00:00:00 2001 From: Sharon Katz <121527325+sharon-fdm@users.noreply.github.com> Date: Thu, 7 Mar 2024 15:07:00 -0500 Subject: [PATCH] Update Releasing-Fleet.md (#17233) Swap steps 1 and 3 --------- Co-authored-by: Luke Heath --- docs/Contributing/Releasing-Fleet.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/Contributing/Releasing-Fleet.md b/docs/Contributing/Releasing-Fleet.md index c1180db6d1..5e5854e033 100644 --- a/docs/Contributing/Releasing-Fleet.md +++ b/docs/Contributing/Releasing-Fleet.md @@ -15,6 +15,8 @@ Note: Please prefix versions with `fleet-v` (e.g., `fleet-v4.0.0`) in git tags, - Terraform variables ([AWS](https://github.com/fleetdm/fleet/blob/main/infrastructure/dogfood/terraform/aws/variables.tf)/[GCP](https://github.com/fleetdm/fleet/blob/main/infrastructure/dogfood/terraform/gcp/variables.tf)) - [Kubernetes `fleet-deployment.yml` file](https://github.com/fleetdm/fleet/blob/main/docs/Deploy/kubernetes/fleet-deployment.yml) - All Terraform (*.tf) files referencing the previous version of Fleet. +- The full list can be found by using git grep: + % git grep "4\.3\.0" Commit these changes via Pull Request and pull the changes on the `main` branch locally. @@ -57,21 +59,21 @@ When the Actions Workflow has been completed, [publish the new version of Fleet] We issue scheduled patch releases every Monday between minor releases if any bug fixes have merged. We issue patches immediately for critical bugs as defined in [our handbook](https://fleetdm.com/handbook/quality#critical-bugs). -1. Complete the steps above to [prepare a new version of Fleet](#prepare-a-new-version-of-fleet). - -2. Create a new branch, starting from the git tag of the prior release. Patch branches should be prefixed with `patch-`. In this example we are creating `v4.3.1`: +1. Create a new branch, starting from the git tag of the prior release. Patch branches should be prefixed with `patch-`. In this example we are creating `v4.3.1`: ```sh git checkout fleet-v4.3.0 git checkout --branch patch-fleet-v4.3.1 ``` -3. Cherry picks the necessary commits from `main` into the new branch: +2. Cherry picks the necessary commits from `main` into the new branch: ```sh git cherry-pick d34db33f ``` +3. Complete the steps above to [prepare a new version of Fleet](#prepare-a-new-version-of-fleet). + > Commits must be cherry-picked in the order they appear on `main` to avoid conflicts. Make sure to also cherry-pick the commit containing changelog and version number updates. 4. **Important!** Any migrations that are not cherry-picked in a patch must have a _later_ timestamp than migrations that were cherry-picked. If there are new migrations that were not cherry-picked, verify that those migrations have later timestamps. If they do not, submit a new Pull Request to increase the timestamps and ensure that migrations are run in the appropriate order.