Confirmed users
471
edits
Jetpack/Release Process: Difference between revisions
Jump to navigation
Jump to search
→Panic
(start editing the hot-fix section) |
(→Panic) |
||
| Line 451: | Line 451: | ||
= Panic = | = Panic = | ||
Hot-Fixes are releases that are made directly on the "release" branch, rather than the usual "stabilization" branch. | Hot-Fixes are releases that are made directly on the "release" branch, rather | ||
than the usual "stabilization" branch, and contain just one or two fixes | |||
relative to the previous release. The Release Manager may decide to handle | |||
critical bugs in e.g. 1.5 by creating a hot-fix release (1.5.1) instead of | |||
waiting for the next scheduled release cycle (1.6). | |||
To create a hot-fix release, start by creating a branch based off the most | |||
recent release tag, cherry pick the important fix to it from master, make the | |||
release, then merge back to stabilization. | |||
The basic idea is that the "release" branch should always be a descendant of | |||
the "stabilization" branch, so that normal releases (made on stabilization) | |||
cause the "release" branch to be fast-forwarded to the new revision. The | |||
normal release cycle takes care of this automatically: the code is developed | |||
and tagged on stabilization, then "release" is moved forward to point to the | |||
same revision. But since hotfixes are developed on "release", an extra | |||
post-release merge step is necessary to bring "stabilization" up-to-date. | |||
The process is: | |||