canmove, Confirmed users
2,056
edits
Jetpack/Release Process: Difference between revisions
Jump to navigation
Jump to search
→Merge Master to Stabilization
| Line 120: | Line 120: | ||
git merge master | git merge master | ||
Set JPCV (Jetpack Current Version) to the current version identifier on the | If there are merge conflicts, resolve them, then commit the merge. | ||
Change back to the master branch: | |||
git checkout master | |||
Set JPCV (Jetpack Current Version) to the current version identifier on the master branch (f.e. 1.2a0): | |||
export JPCV=`cat .version` | export JPCV=`cat .version` | ||
Set JPNV (Jetpack Next Version) to the next version identifier on the | Set JPNV (Jetpack Next Version) to the next version identifier on the master branch (f.e. 1.3a0): | ||
export JPNV=(NEXT VERSION) | export JPNV=(NEXT VERSION) | ||
| Line 130: | Line 136: | ||
Change the version identifier on the master branch for the next development cycle: | Change the version identifier on the master branch for the next development cycle: | ||
find .version * -type f -exec perl -pi -e "s/${JPCV}/${JPNV}/g" {} \; | find .version * -type f -exec perl -pi -e "s/${JPCV}/${JPNV}/g" {} \; | ||
| Line 138: | Line 143: | ||
git commit -a -m"update SDK version to ${JPNV} for next development cycle" | git commit -a -m"update SDK version to ${JPNV} for next development cycle" | ||
Change the Firefox minVersion/maxVersion compatibility identifiers on the master branch to the values on the Firefox aurora/central branches. | |||
Commit the changes: | |||
git commit -a -m"update Firefox minVersion/maxVersion to aurora/central versions of Firefox" | |||
Check out the stabilization branch: | Check out the stabilization branch: | ||