From 85c11f76696fb1138f2cf3e265ea24154c9e9c37 Mon Sep 17 00:00:00 2001 From: Nate Rock Date: Wed, 10 Dec 2025 13:03:40 -0600 Subject: [PATCH 1/6] 25.12 updated Maintainer Docs - Hotfix Process --- releases/hotfix.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/releases/hotfix.md b/releases/hotfix.md index b86c0297206..ca2dffef7f2 100644 --- a/releases/hotfix.md +++ b/releases/hotfix.md @@ -58,19 +58,19 @@ Also consider the timing of when the next release is scheduled. If the freeze or ### Process **NOTE:** The processes below use these releases as examples: -- Current release `M.A.X` -- Next minor release `M.B.0` (where `B=A+1`) -- Next patch release `M.A.Y` (where `Y=X+1`) +- Current release `YY.MA.X` +- Next release `YY.MB.0` (where `MB=MA+2`) +- Next patch release `MM.MA.Y` (where `Y=X+1`) Developers {: .label .label-green} 1. Hotfix issues will be assigned to you -2. Create your branch from the `branch-M.A` branch +2. Create your branch from the `release/YY.MA` branch 3. Implement the fix succinctly 1. Change the minimal amount of code required 2. Update related documentation and unit tests 3. It is acceptable to implement a quick fix and open a new issue for a more in depth solution -4. Once complete, create a pull request targeting `branch-M.A` +4. Once complete, create a pull request targeting `release/YY.MA` 5. Notify the project lead Project Leads @@ -86,9 +86,9 @@ Operations {: .label .label-purple} 1. Once notified by a Project Lead, review the pull request 2. Begin testing of conda and containers for correctness and functionality -3. Review documentation to ensure version numbers (updating to `M.A.Y`) and instructions are correct -4. Merge the developer's PR targeting `branch-M.A` after approval -5. Create a new PR from `branch-M.A` targeting `main` +3. Review documentation to ensure version numbers (updating to `YY.MA.Y`) and instructions are correct +4. Merge the developer's PR targeting `release/YY.MA` after approval +5. Create a new PR from `release/YY.MA` targeting `main` 6. Merge the PR targeting `main` after review and approval 7. Monitor process of automated tools 8. Spot check deliverables to ensure correctness From 084dbbc1e0d6d55325f04ebd33e7eb5d5f43384a Mon Sep 17 00:00:00 2001 From: Nate Rock Date: Thu, 11 Dec 2025 12:47:22 -0600 Subject: [PATCH 2/6] removed Major and Minor as just updated to Release --- releases/hotfix.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releases/hotfix.md b/releases/hotfix.md index ca2dffef7f2..5eb06b1efd6 100644 --- a/releases/hotfix.md +++ b/releases/hotfix.md @@ -26,7 +26,7 @@ Operations ### See also * [Hotfix versioning]({% link resources/versions.md %}) -* [Major and minor releases]({% link releases/process.md %}) +* [Releases]({% link releases/process.md %}) ## Hotfixes From 4caa1632a6438d3f4bd41da56be3ccf90a929191 Mon Sep 17 00:00:00 2001 From: Nate Rock Date: Mon, 15 Dec 2025 15:01:28 -0600 Subject: [PATCH 3/6] updated hotfix to use the actual NBS process --- releases/hotfix.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/releases/hotfix.md b/releases/hotfix.md index 5eb06b1efd6..292aaac46db 100644 --- a/releases/hotfix.md +++ b/releases/hotfix.md @@ -65,12 +65,16 @@ Also consider the timing of when the next release is scheduled. If the freeze or Developers {: .label .label-green} 1. Hotfix issues will be assigned to you -2. Create your branch from the `release/YY.MA` branch +2. Create `hotfix/YY.MA` branch from `^vYY.MA.00` (commit `BEFORE` the tag) 3. Implement the fix succinctly 1. Change the minimal amount of code required 2. Update related documentation and unit tests 3. It is acceptable to implement a quick fix and open a new issue for a more in depth solution -4. Once complete, create a pull request targeting `release/YY.MA` +4. Once complete, create a pull request targeting the following + 1. `hotfix/YY.MM` → `release/YY.MM` and merge + 2. `hotfix/YY.MM` → `main` and merge + 1. This can also be done as a `cherry-pick` from `release/YY.MM` -> `main` + 3. ***NOTE:*** After the `release/YY.MM` has completed, the [forward merger]({% link resources/auto-merge.md %}) will no longer automatically merge from `release/YY.MM` -> `main` 5. Notify the project lead Project Leads From 3f572712d1eb18c3f960c83a13caebbf0b06ed9e Mon Sep 17 00:00:00 2001 From: Nate Rock Date: Mon, 15 Dec 2025 15:06:02 -0600 Subject: [PATCH 4/6] fix some incorrect usages of YY.MM -> YY.MA and used YY.MM.PX --- releases/hotfix.md | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/releases/hotfix.md b/releases/hotfix.md index 292aaac46db..6ba19aea65a 100644 --- a/releases/hotfix.md +++ b/releases/hotfix.md @@ -58,23 +58,23 @@ Also consider the timing of when the next release is scheduled. If the freeze or ### Process **NOTE:** The processes below use these releases as examples: -- Current release `YY.MA.X` +- Current release `YY.MA.PX` - Next release `YY.MB.0` (where `MB=MA+2`) -- Next patch release `MM.MA.Y` (where `Y=X+1`) +- Next patch release `MM.MA.PY` (where `PY=PX+1`) Developers {: .label .label-green} 1. Hotfix issues will be assigned to you -2. Create `hotfix/YY.MA` branch from `^vYY.MA.00` (commit `BEFORE` the tag) +2. Create `hotfix/YY.MA.PX` branch from `^vYY.MA.00` (commit `BEFORE` the tag) 3. Implement the fix succinctly 1. Change the minimal amount of code required 2. Update related documentation and unit tests 3. It is acceptable to implement a quick fix and open a new issue for a more in depth solution 4. Once complete, create a pull request targeting the following - 1. `hotfix/YY.MM` → `release/YY.MM` and merge - 2. `hotfix/YY.MM` → `main` and merge - 1. This can also be done as a `cherry-pick` from `release/YY.MM` -> `main` - 3. ***NOTE:*** After the `release/YY.MM` has completed, the [forward merger]({% link resources/auto-merge.md %}) will no longer automatically merge from `release/YY.MM` -> `main` + 1. `hotfix/YY.MA.PX` → `release/YY.MA` and merge + 2. `hotfix/YY.MA.PX` → `main` and merge + 1. This can also be done as a `cherry-pick` from `release/YY.MA` -> `main` + 3. ***NOTE:*** After the `release/YY.MA` has completed, the [forward merger]({% link resources/auto-merge.md %}) will no longer automatically merge from `release/YY.MA` -> `main` 5. Notify the project lead Project Leads @@ -90,9 +90,8 @@ Operations {: .label .label-purple} 1. Once notified by a Project Lead, review the pull request 2. Begin testing of conda and containers for correctness and functionality -3. Review documentation to ensure version numbers (updating to `YY.MA.Y`) and instructions are correct -4. Merge the developer's PR targeting `release/YY.MA` after approval -5. Create a new PR from `release/YY.MA` targeting `main` -6. Merge the PR targeting `main` after review and approval +3. Review documentation to ensure version numbers (updating to `YY.MA.PX`) and instructions are correct +4. Merge the developer's PR from the `hotfix/YY.MM.PX` targeting `release/YY.MA` after approval +5. Merge the developer's PR from the `hotfix/YY.MM.PX` targeting `main` after approval 7. Monitor process of automated tools 8. Spot check deliverables to ensure correctness From 4749060f6190fc9b41e103055a48332bbee85feb Mon Sep 17 00:00:00 2001 From: Nate Rock Date: Mon, 15 Dec 2025 15:06:47 -0600 Subject: [PATCH 5/6] instead of merge, notify Operations in hotfix branches --- releases/hotfix.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/releases/hotfix.md b/releases/hotfix.md index 6ba19aea65a..c2752afceb5 100644 --- a/releases/hotfix.md +++ b/releases/hotfix.md @@ -71,8 +71,8 @@ Developers 2. Update related documentation and unit tests 3. It is acceptable to implement a quick fix and open a new issue for a more in depth solution 4. Once complete, create a pull request targeting the following - 1. `hotfix/YY.MA.PX` → `release/YY.MA` and merge - 2. `hotfix/YY.MA.PX` → `main` and merge + 1. `hotfix/YY.MA.PX` → `release/YY.MA` and notify Operations + 2. `hotfix/YY.MA.PX` → `main` and notify Operations 1. This can also be done as a `cherry-pick` from `release/YY.MA` -> `main` 3. ***NOTE:*** After the `release/YY.MA` has completed, the [forward merger]({% link resources/auto-merge.md %}) will no longer automatically merge from `release/YY.MA` -> `main` 5. Notify the project lead From 917eb85f02b639ed3a583871cd5f5c61d187e059 Mon Sep 17 00:00:00 2001 From: Nate Rock Date: Mon, 15 Dec 2025 15:17:23 -0600 Subject: [PATCH 6/6] auto-merger.md instead of auto-merge.md --- releases/hotfix.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releases/hotfix.md b/releases/hotfix.md index c2752afceb5..968072dca52 100644 --- a/releases/hotfix.md +++ b/releases/hotfix.md @@ -74,7 +74,7 @@ Developers 1. `hotfix/YY.MA.PX` → `release/YY.MA` and notify Operations 2. `hotfix/YY.MA.PX` → `main` and notify Operations 1. This can also be done as a `cherry-pick` from `release/YY.MA` -> `main` - 3. ***NOTE:*** After the `release/YY.MA` has completed, the [forward merger]({% link resources/auto-merge.md %}) will no longer automatically merge from `release/YY.MA` -> `main` + 3. ***NOTE:*** After the `release/YY.MA` has completed, the [forward merger]({% link resources/auto-merger.md %}) will no longer automatically merge from `release/YY.MA` -> `main` 5. Notify the project lead Project Leads