Tree Rules: Difference between revisions

1,218 bytes removed ,  14 May 2020
→‎mozilla-beta: remove obsolete info about xpidl and uuids
(Removed obsolete branches)
(→‎mozilla-beta: remove obsolete info about xpidl and uuids)
 
(3 intermediate revisions by one other user not shown)
Line 9: Line 9:
[[File:Land patch - go home.jpg|300px|right]]
[[File:Land patch - go home.jpg|300px|right]]


The following rules apply to integration branches managed by the [[Sheriffing|Sheriffs]], namely [https://treeherder.mozilla.org/#/jobs?repo=autoland autoland] and [https://treeherder.mozilla.org/#/jobs?repo=mozilla-inbound mozilla-inbound].
The following rules apply to integration branch managed by the [[Sheriffing|Sheriffs]], namely [https://treeherder.mozilla.org/#/jobs?repo=autoland autoland].


=== [https://treeherder.mozilla.org/#/jobs?repo=autoland autoland] ===
=== [https://treeherder.mozilla.org/#/jobs?repo=autoland autoland]/Lando ===
If you are using [http://mozilla-version-control-tools.readthedocs.io/en/latest/mozreview.html MozReview] to post and review patches, you can also use the tool to automatically land those patch to the autoland repository. This is the preferred method of landing Mozilla code because, in almost all cases, it involves the least work for humans, including you.
If you are using [https://moz-conduit.readthedocs.io/en/latest/phabricator-user.html Phabricator] to post and review patches, you can also use the tool to automatically land those patch to the autoland repository. This is the preferred method of landing Mozilla code because, in almost all cases, it involves the least work for humans, including you.


Please see the documentation on [http://mozilla-version-control-tools.readthedocs.io/en/latest/mozreview/autoland.html Landing Commits with Autoland] for details on how to use autoland.
Please see the documentation on [https://moz-conduit.readthedocs.io/en/latest/lando-user.html Landing Commits with Lando] for details on how to use Lando.


Sheriffs will merge autoland into mozilla-central approximately daily.
Sheriffs will merge autoland into mozilla-central a few times a day.
 
=== [https://treeherder.mozilla.org/#/jobs?repo=mozilla-inbound mozilla-inbound] ===
If you're not using [http://mozilla-version-control-tools.readthedocs.io/en/latest/mozreview.html MozReview], or need to have more control over the order or timing of your commits (touching multiple systems, etc), you can still land code the manually into the mozilla-inbound repository. These general rules apply:
* '''All changes''' must meet the [https://developer.mozilla.org/en-US/docs/Mozilla/Developer_guide/Committing_Rules_and_Responsibilities general checkin rules], except you do not need to watch the tree after pushing.
* mozilla-inbound is merged into mozilla-central approximately daily.
* Please read '''[[Tree Rules/Integration| the integration rules]]''' for commit procedures and the list of sheriffs.
* Ask in #developers on [[IRC]] if you have any questions.


== [https://treeherder.mozilla.org/#/jobs?repo=mozilla-central mozilla-central] (Nightly channel) ==
== [https://treeherder.mozilla.org/#/jobs?repo=mozilla-central mozilla-central] (Nightly channel) ==
Line 55: Line 47:
* Patches nominated for beta should:
* Patches nominated for beta should:
** not change any localizable strings.
** not change any localizable strings.
** not change binary interfaces or otherwise break add-on compatibility.  (In particular, they should not make any change to an [https://developer.mozilla.org/en-US/docs/Mozilla/XPIDL XPIDL] interface that requires a UUID change.)
** have tests, or a strong statement of what can be done in the absence of tests.
** have tests, or a strong statement of what can be done in the absence of tests.
** have landed in mozilla-central to bake on the nightly channel for a few days.
** have landed in mozilla-central to bake on the nightly channel for a few days.
** have a comment in Bugzilla assessing performance impact, risk, and reasons the patch is needed on beta.
** have a comment in Bugzilla assessing performance impact, risk, and reasons the patch is needed on beta.
* Approval requests will be processed by by the [[Release_Management|release manager]] team.
* Approval requests will be processed by by the [[Release_Management|release manager]] team.
* Set the appropriate ''status-firefoxN'' flag to "fixed" after landing a fix on the Beta branch.  
* Set the appropriate ''status-firefoxN'' flag to "fixed" after landing a fix on the Beta branch.


== [https://treeherder.mozilla.org/#/jobs?repo=mozilla-release mozilla-release] ==
== [https://treeherder.mozilla.org/#/jobs?repo=mozilla-release mozilla-release] ==