[FEA] New branching strategy task tracking #34
Description
Rapids notice: https://docs.rapids.ai/notices/rsn0047/
Rapids rollout steps: https://github.com/rapidsai/ops/issues/3968
Affected projects
- https://github.com/NVIDIA/spark-rapids-jni
- internal spark-rapids-private
- internal rapids-hybrid-execution
- https://github.com/NVIDIA/spark-rapids
- https://github.com/NVIDIA/spark-rapids-examples
- https://github.com/NVIDIA/spark-rapids-ml
Comparison
| Aspect | Legacy | New (25.12+， targeting 25.12) |
|---|---|---|
| Default branch | Branch-YY.MM | main |
| Release branch | main | release/YY.MM |
| Pull request | default branch. Manually retarget a few if a different release | main. During the pre-release(Burndown starts), most of the PRs need to be re-targeted to the release/YY.MM |
| Burndown and code freeze | create Branch-YY.MM-next | Create branch release/YY.MM, bump up main to <YY.MM-next>.0-SNAPSHOT, enable auto-merge from release/YY.MM to main |
| Release | Merge branch-YY.MM to main, tag and create release vYY.MM.0 on main | Tag and create release vYY.MM.0 on release/YY.MM, disable auto-merge from release/YY.MM to main, bump up release/YY.MM to <YY.MM>.+1-SNAPSHOT for continued development |
| Hotfix PR (after release) | default branch, and then merge to main and release | Create branch hotfix-foo based on release/YY.MM, open PRs to release/YY.MM and main (Auto merge has been disabled after first release), and release |