Confirmed users
250
edits
Jetpack/Integration Process: Difference between revisions
→Checking changes: mention build files which need to be updated.
(→Checking changes: mention build files which need to be updated.) |
|||
| (4 intermediate revisions by the same user not shown) | |||
| Line 72: | Line 72: | ||
hg status -ur addon-sdk/source # Should show no results | hg status -ur addon-sdk/source # Should show no results | ||
hg status # Shows you all the changes you're about to land | hg status # Shows you all the changes you're about to land | ||
=== addon-sdk/moz.build === | |||
Make sure that the addon-sdk/moz.build file is correct, you can use this script to update it: | |||
./mach generate-addon-sdk-moz-build | |||
This is not a perfect script though, it may have bugs so if you notice something file something. | |||
=== addon-sdk/source/test/jetpack-package.ini === | |||
There is no script to update this at the moment, this is bug 1119600, so updates must be done by hand. | |||
=== addon-sdk/source/test/addons/jetpack-package.ini === | |||
There is no script to update this at the moment, this is bug 1119601, so updates must be done by hand. | |||
== Testing changes == | == Testing changes == | ||
| Line 85: | Line 101: | ||
Pushes the temporary commit to the try server, depending on your TryChooser string you should get an email telling you where to look for results. | Pushes the temporary commit to the try server, depending on your TryChooser string you should get an email telling you where to look for results. | ||
Once you're done the following converts the temporary commit to a real commit that can be pushed to the project branch: | === Failure === | ||
If the try push fails, you'll have to investigate why, and make some changes, once you've made some changes, try | |||
hg status | |||
This should show you only the files which you have changed, they should only be changes to the addon-sdk folder normally. | |||
hg addremove addon-sdk | |||
Then, you'll need to update your patch | |||
hg qrefresh -e | |||
You can test that this worked with | |||
hg status | |||
Which should have no results | |||
hg log -l 2 | |||
Should show your one patch in a queue, now you may push to try again | |||
hg push -f ssh://hg.mozilla.org/try/ | |||
=== Success === | |||
Once you're done the following converts the temporary commit in to a real commit that can be pushed to the project branch: | |||
hg qrefresh -e # Edit the commit message to remove the try: syntax | hg qrefresh -e # Edit the commit message to remove the try: syntax | ||
| Line 95: | Line 139: | ||
hg commit | hg commit | ||
== Reverting a local commit == | |||
If you made a commit, and the tree you want to push to updates before you are able to push, then you need to revert your local commit and save it as a patch, update your local branch, and then put your patch back on top. This is basically a git rebase. | |||
hg qimport -r tip | |||
hg qpop | |||
hg pull -u | |||
hg qpush testpatch | |||
Now you'll have a queue with one patch, which is the patch you are rebasing. | |||
Finalize the patch when you are ready, before doing this though you may which you push to try again.. | |||
hg qfin -a | |||
Now you have a real commit again. | |||
== Pushing the changes to the project branch == | == Pushing the changes to the project branch == | ||
| Line 102: | Line 163: | ||
Pushes the changes to fx-team. | Pushes the changes to fx-team. | ||
=== Backouts === | |||
If you missed something when doing your try pushes, then it is likely that you will be backed out, if this happens then repeat the process. | |||