Tree Rules: Difference between revisions
Jump to navigation
Jump to search
(→Integration Branches: Update link) |
(Document the standing arrangement with release drivers about a=testonly/a=npotb) |
||
Line 27: | Line 27: | ||
* '''All changes''' must meet the [https://developer.mozilla.org/En/Developer_Guide/Committing_Rules_and_Responsibilities general checkin rules]. You must check the tree before pushing, and watch the tree for failures after pushing. | * '''All changes''' must meet the [https://developer.mozilla.org/En/Developer_Guide/Committing_Rules_and_Responsibilities general checkin rules]. You must check the tree before pushing, and watch the tree for failures after pushing. | ||
* Patches must have the '''approval-mozilla-aurora+''' flag in Bugzilla. To request approval, set the approval-mozilla-aurora? flag on the patch you wish to check in. | * Patches must have the '''approval-mozilla-aurora+''' flag in Bugzilla. To request approval, set the approval-mozilla-aurora? flag on the patch you wish to check in. Exception: If patches only make changes to tests, test harnesses or anything else that does not affect the shipped builds, they may land with self approval (use a=testonly, a=npotb etc). | ||
* Patches nominated for aurora should: | * Patches nominated for aurora should: | ||
** not change any localizable strings. | ** not change any localizable strings. | ||
Line 41: | Line 41: | ||
* '''All changes''' must meet the [https://developer.mozilla.org/En/Developer_Guide/Committing_Rules_and_Responsibilities general checkin rules]. You must check the tree before pushing, and watch the tree for failures after pushing. | * '''All changes''' must meet the [https://developer.mozilla.org/En/Developer_Guide/Committing_Rules_and_Responsibilities general checkin rules]. You must check the tree before pushing, and watch the tree for failures after pushing. | ||
* Patches must have the '''approval-mozilla-beta+''' flag in Bugzilla. To request approval, set the approval-mozilla-beta? flag on the patch you wish to check in. | * Patches must have the '''approval-mozilla-beta+''' flag in Bugzilla. To request approval, set the approval-mozilla-beta? flag on the patch you wish to check in. Exception: If patches only make changes to tests, test harnesses or anything else that does not affect the shipped builds, they may land with self approval (use a=testonly, a=npotb etc). | ||
* Patches nominated for beta should: | * Patches nominated for beta should: | ||
** not change any localizable strings. | ** not change any localizable strings. | ||
Line 55: | Line 55: | ||
'''<font color="orange">APPROVAL REQUIRED</font>''' | '''<font color="orange">APPROVAL REQUIRED</font>''' | ||
* Patches must have the '''approval-mozilla-release+''' flag in Bugzilla. To request approval, set the approval-mozilla-release? flag on the patch you wish to check in. | * Patches must have the '''approval-mozilla-release+''' flag in Bugzilla. To request approval, set the approval-mozilla-release? flag on the patch you wish to check in. Exception: If patches only make changes to tests, test harnesses or anything else that does not affect the shipped builds, they may land with self approval (use a=testonly, a=npotb etc). | ||
* In the normal development process, no changes will land on mozilla-release except [[RapidRelease/Calendar|regular merges from mozilla-beta]] every six weeks. | * In the normal development process, no changes will land on mozilla-release except [[RapidRelease/Calendar|regular merges from mozilla-beta]] every six weeks. | ||
* Changes to the release branch are limited to urgent "chemspills" like zero-day security vulnerabilities and other unplanned emergencies. Any changes to this branch will be directly overseen by [[Releases/Drivers|release drivers]]. They are also subject to the same restrictions as [[#mozilla-beta]], including string freeze and UUID freeze. | * Changes to the release branch are limited to urgent "chemspills" like zero-day security vulnerabilities and other unplanned emergencies. Any changes to this branch will be directly overseen by [[Releases/Drivers|release drivers]]. They are also subject to the same restrictions as [[#mozilla-beta]], including string freeze and UUID freeze. |
Revision as of 08:29, 8 May 2014
For comm-central tree rules, see this page.
Not sure which Firefox version is on which branch today? See RapidRelease/Calendar.
Looking to add a new platform/job type to TBPL? See Sheriffing/Job_Visibility_Policy.
mozilla-central (Nightly channel)
- All changes must meet the general checkin rules. You must check the tree before pushing, and watch the tree for failures after pushing.
- Set the Target Milestone field in Bugzilla to the current Nightly version after landing a bug fix on mozilla-central.
- Please ask in #developers on IRC if you have questions.
Integration Branches
The following rules apply to integration branches managed by the sheriffs, including mozilla-inbound, b2g-inbound, and fx-team.
- All changes must meet the general checkin rules, except you do not need to watch the tree after pushing.
- These branches are merged into mozilla-central approximately daily.
- Please read Tree Rules/Integration for commit procedures and the list of sheriffs.
- Ask in #developers on IRC if you have any questions.
mozilla-aurora
APPROVAL REQUIRED
- All changes must meet the general checkin rules. You must check the tree before pushing, and watch the tree for failures after pushing.
- Patches must have the approval-mozilla-aurora+ flag in Bugzilla. To request approval, set the approval-mozilla-aurora? flag on the patch you wish to check in. Exception: If patches only make changes to tests, test harnesses or anything else that does not affect the shipped builds, they may land with self approval (use a=testonly, a=npotb etc).
- Patches nominated for aurora should:
- not change any localizable strings.
- 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 a comment in Bugzilla assessing performance impact, risk, and reasons the patch is needed on aurora.
- Approval requests will be processed by release drivers in the weekly Firefox/Channels meetings.
- Set the appropriate status-firefoxN flag to "fixed" after landing a fix on the Aurora branch.
mozilla-beta
APPROVAL REQUIRED
- All changes must meet the general checkin rules. You must check the tree before pushing, and watch the tree for failures after pushing.
- Patches must have the approval-mozilla-beta+ flag in Bugzilla. To request approval, set the approval-mozilla-beta? flag on the patch you wish to check in. Exception: If patches only make changes to tests, test harnesses or anything else that does not affect the shipped builds, they may land with self approval (use a=testonly, a=npotb etc).
- Patches nominated for beta should:
- 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 XPIDL interface that requires a UUID change.)
- 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 a comment in Bugzilla assessing performance impact, risk, and reasons the patch is needed on beta.
- Approval requests will be processed by release drivers in the weekly Firefox/Channels meetings.
- Set the appropriate status-firefoxN flag to "fixed" after landing a fix on the Beta branch.
mozilla-release
APPROVAL REQUIRED
- Patches must have the approval-mozilla-release+ flag in Bugzilla. To request approval, set the approval-mozilla-release? flag on the patch you wish to check in. Exception: If patches only make changes to tests, test harnesses or anything else that does not affect the shipped builds, they may land with self approval (use a=testonly, a=npotb etc).
- In the normal development process, no changes will land on mozilla-release except regular merges from mozilla-beta every six weeks.
- Changes to the release branch are limited to urgent "chemspills" like zero-day security vulnerabilities and other unplanned emergencies. Any changes to this branch will be directly overseen by release drivers. They are also subject to the same restrictions as #mozilla-beta, including string freeze and UUID freeze.
mozilla-b2g28_v1_3 (and other B2G branches)
APPROVAL REQUIRED
mozilla-esr24 (Firefox 24.x.y ESR)
APPROVAL REQUIRED