Confirmed users
471
edits
Jetpack/Release Process: Difference between revisions
Jump to navigation
Jump to search
→Panic
(→Panic) |
(→Panic) |
||
| Line 469: | Line 469: | ||
post-release merge step is necessary to bring "stabilization" up-to-date. | post-release merge step is necessary to bring "stabilization" up-to-date. | ||
The process is: | The general process is: | ||
* git clone git@github.com:mozilla/addon-sdk | |||
* cd addon-sdk | |||
* git checkout release | |||
* cherry-pick fixes from master to fix the bug, repeat until it works | |||
* git tag NEWRELEASE | |||
* use 'git archive' to create tarballs | |||
* upload tarballs | |||
* git checkout stabilization | |||
* git merge release (this may require conflict-resolution) | |||
* git push origin NEWRELEASE release stabilization | |||
It may be easier to use a personal branch while developing the fix, to share | |||
release candidates with others (especially when asking the original bug | |||
submitter to validate the fix). In that case, the process will look something | |||
like: | |||
* git clone MYGITHUBREPO ; cd MYREPO | |||
* git remote add official git@github.com:mozilla/addon-sdk | |||
* git fetch official | |||
* git checkout -b hotfix official/release | |||
* cherry-pick fixes, share RC builds | |||
* git push origin hotfix (to share code) | |||
* git checkout release | |||
* git merge --ff-only hotfix | |||
* git tag NEWRELEASE | |||
* make+upload tarballs | |||
* git checkout stabilization | |||
* git merge official/release (and resolve conflicts) | |||
* git push official NEWRELEASE release stabilization | |||
* git branch -D hotfix | |||