|
|
| Line 9: |
Line 9: |
| | '''Code Complete (CC)''' | | | '''Code Complete (CC)''' |
| | '''Underlying Gecko Version''' | | | '''Underlying Gecko Version''' |
| |-
| |
| | v1.4
| |
| | ~December 9, 2013
| |
| | March 17, 2014
| |
| | Apr 29, 2014
| |
| | June 09, 2014
| |
| |'''Gecko 30'''
| |
| |- | | |- |
| | v2.0 | | | v2.0 |
| Line 103: |
Line 96: |
| | December 9, 2013 | | | December 9, 2013 |
| | Gecko 26 | | | Gecko 26 |
| | Gecko 26 | | | Gecko 32 |
| | blocking-b2g:koi+ | | | blocking-b2g:koi+ |
| | June 09, 2014 | | | June 09, 2014 |
| Line 112: |
Line 105: |
| | <s>March 3, 2014</s> March 17, 2014 | | | <s>March 3, 2014</s> March 17, 2014 |
| | Gecko 28 | | | Gecko 28 |
| | Gecko 28 | | | Gecko 34 |
| | blocking-b2g:1.3+ | | | blocking-b2g:1.3+ |
| | September 01, 2014 | | | September 01, 2014 |
| | |- |
| | | v1.4 |
| | | ~December 9, 2013 |
| | | Apr 29, 2014 |
| | | June 09, 2014 |
| | | Gecko 30 |
| | | Gecko 40 |
| | | blocking-b2g:1.4+ |
| | | May 11, 2015 |
| |- | | |- |
| |} | | |} |
| Line 163: |
Line 165: |
| == Branch Information == | | == Branch Information == |
| See also [[B2G/Roadmap]]. | | See also [[B2G/Roadmap]]. |
|
| |
| === v1.4 ===
| |
| <b>Open for approved patches and security fixes.</b>
| |
| ==== Source Repositories ====
| |
| * Gecko: [https://hg.mozilla.org/releases/mozilla-b2g30_v1_4/ b2g30_v1_4] ("b2g30_v1_4")
| |
| * Gaia: [https://github.com/mozilla-b2g/gaia/tree/v1.4 v1.4 branch] ("v1.4")
| |
| * B2G Manifests: [https://github.com/mozilla-b2g/b2g-manifest/tree/v1.4 v1.4] ("v1.4")
| |
|
| |
| ==== Landing Procedure ====
| |
| * sec-high and sec-critical patches have automatic approval to land if the fix has landed on all affected Firefox branches. All others must have approval-mozilla-b2g30+ / approval-gaia-v1.4+ to land (<b>including bugs marked as blocking-b2g:1.4+</b>)
| |
| * Follow normal landing practices for Trunk/Master.
| |
| * Unless the bug only affects that branch, the bug must be Resolved/Fixed before uplifting.
| |
| * Add a=1.4+ for security bugs or a=<whoever approved> to the end of the commit message and uplift to:
| |
| ** [https://github.com/mozilla-b2g/gaia/tree/v1.4 v1.4]/[https://hg.mozilla.org/releases/mozilla-b2g30_v1_4 b2g30] (setting status-b2g-v1.4:fixed)
| |
|
| |
| ==== Blocker/Approval Queries ====
| |
| * All blocking-b2g:1.4? - http://mzl.la/1m397bp
| |
| * Open blocking-b2g:1.4+ - http://mzl.la/1ajCpx4
| |
| * approval-gaia-v1.4? - http://mzl.la/1g5f20M
| |
| * approval-mozilla-b2g30? - http://mzl.la/K3sipF
| |
|
| |
|
| === v2.0 === | | === v2.0 === |
| Line 300: |
Line 282: |
|
| |
|
| == Automatic Branch Uplifts == | | == Automatic Branch Uplifts == |
| === v1.4 ===
| |
| * Ready to uplift to mozilla-b2g30_v1_4 (Gecko)
| |
| ** <strike>[https://bugzilla.mozilla.org/buglist.cgi?order=Bug%20Number&bug_status=RESOLVED&bug_status=VERIFIED&resolution=FIXED&field0-0-0=cf_blocking_b2g&type0-0-0=anywordssubstr&value0-0-0=1.4%2B&field0-1-0=component&type0-1-0=nowords&value0-1-0=Gaia&field0-2-0=cf_status_b2g_1_4&type0-2-0=nowordssubstr&value0-2-0=fixed%20verified%20unaffected%20wontfix%20disabled&field0-3-0=status_whiteboard&type0-3-0=nowordssubstr&value0-3-0=NO_UPLIFT%20NPOTB%20POVB blocking-b2g:1.4+ (without NO_UPLIFT, NPOTB, or POVB)]</strike> - <b>ALL BLOCKERS MUST HAVE APPROVAL TO LAND</b>
| |
| ** [https://bugzilla.mozilla.org/buglist.cgi?field0-0-0=flagtypes.name;type0-0-0=anywordssubstr;value0-0-0=approval-mozilla-b2g30%2B;field0-1-0=cf_status_b2g_1_4;type0-1-0=nowordssubstr;value0-1-0=fixed%20verified%20unaffected%20wontfix%20disabled approval-mozilla-b2g30+]
| |
| * Ready to uplift to v1.4 (Gaia)
| |
| ** <strike>[https://bugzilla.mozilla.org/buglist.cgi?f10=CP&o5=nowordssubstr&f1=OP&list_id=7950540&f8=component&f0=OP&v11=NO_UPLIFT%20NPOTB%20POVB&o11=nowordssubstr&resolution=FIXED&o2=anywordssubstr&f9=CP&j7=OR&f4=OP&v5=fixed%20verified%20unaffected%20wontfix%20disabled&chfieldto=Now&query_format=advanced&chfield=resolution&j1=OR&f3=CP&chfieldfrom=2014-03-17&f2=cf_blocking_b2g&chfieldvalue=FIXED&f11=status_whiteboard&bug_status=RESOLVED&bug_status=VERIFIED&j4=OR&f5=cf_status_b2g_1_4&v8=Gaia&f6=CP&v2=1.3%2B%201.4%2B&f7=OP&o8=substring blocking-b2g:1.3+/1.4+ (without NO_UPLIFT, NPOTB, or POVB)]</strike> - <b>ALL BLOCKERS MUST HAVE APPROVAL TO LAND</b>
| |
| ** [https://bugzilla.mozilla.org/buglist.cgi?field0-0-0=flagtypes.name;type0-0-0=anywordssubstr;value0-0-0=approval-gaia-v1.4%2B;field0-1-0=cf_status_b2g_1_4;type0-1-0=nowordssubstr;value0-1-0=fixed%20verified%20unaffected%20wontfix%20disabled approval-gaia-v1.4+]
| |
| * [https://bugzilla.mozilla.org/buglist.cgi?order=Last%20Changed&resolution=FIXED&f1=bug_group&o1=substring&v1=sec&f2=cf_status_b2g_1_4&o2=equals&v2=affected Security bugs affecting v1.4]
| |
|
| |
| === v2.0 === | | === v2.0 === |
| * Ready to uplift to mozilla-b2g32_v2_0 (Gecko) | | * Ready to uplift to mozilla-b2g32_v2_0 (Gecko) |
| Line 337: |
Line 310: |
|
| |
|
| == Sanity Checks == | | == Sanity Checks == |
| * FIXED 1.4+ blockers not 2.0:fixed - http://mzl.la/1hW67uH
| |
| * FIXED 2.0+ blockers not 2.0:fixed - http://mzl.la/1rFwsTh | | * FIXED 2.0+ blockers not 2.0:fixed - http://mzl.la/1rFwsTh |
| * FIXED 2.0+ blockers not 2.1:fixed - http://mzl.la/1qqYXau | | * FIXED 2.0+ blockers not 2.1:fixed - http://mzl.la/1qqYXau |