25.12 updated Maintainer Docs - Hotfix Process#716
25.12 updated Maintainer Docs - Hotfix Process#716rockhowse wants to merge 6 commits intorapidsai:mainfrom
Conversation
✅ Deploy Preview for docs-rapids-ai ready!Built without sensitive environment variables
To edit notification comments on pull requests, go to your Netlify project configuration. |
releases/hotfix.md
Outdated
| 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` |
There was a problem hiding this comment.
This is the main section I have questions about... after we cut the official release, are the hotfix PRs that are merged into the release/YY.MAI see a couple scenarios here but need some clarification
-
- hotfix gets merged back into
mainvia theforward merger
- hotfix gets merged back into
-
- cherry pick from
release/YY.MAback intomain
- cherry pick from
-
- separate forward-port (?) PR into
main
- separate forward-port (?) PR into
@AyodeAwe you are probably the best person to help answer this.
There was a problem hiding this comment.
Hotfix process for 25.12 (for example):
- Create
hotfix/25.12branch from^v25.12.00(commit BEFORE the tag) - Apply fix on hotfix branch
- Open PR:
hotfix/25.12→release/25.12and merge - Open PR:
hotfix/25.12→mainand merge
Step 4 can also be to simply cherry pick from release/25.12 into main, I think it achieves the same outcome.
Also note that the forward merger bot does not act if it sees that the branch has already been released (i.e if it sees the release tag)
There was a problem hiding this comment.
Awesome, these are the exact details I need to finish this up. Thx @AyodeAwe
|
@AyodeAwe I believe I updated the Thx for the extra nudge in the right direction here 🙇🏼 |
2 participants
This PR updates the Release Planning section
to bring it up to the current planning/release process post RSN-47
This focuses on using
CALVER (YY.MM.PP)instead and + an un-changingmaindevelopment branchxref: rapidsai/build-planning#224