Releases/Merge Checklist: Difference between revisions
< Releases
Jump to navigation
Jump to search
(Created page with "This is an overall checklist for merging between channel repositories. == Plan == In advance: * Get web content created and in place * Write blog announcements to let people k...") |
|||
| (23 intermediate revisions by 9 users not shown) | |||
| Line 1: | Line 1: | ||
'''Note: we are going to cherry pick from this page to build the canonical doc here: [[Release_Management/Merge_Documentation]] -- so this page is going to become obsolete/removed soon''' | |||
This is an overall checklist for merging between channel repositories. | This is an overall checklist for merging between channel repositories. | ||
| Line 21: | Line 23: | ||
# Make an announcement in #developers on irc.mozilla.org | # Make an announcement in #developers on irc.mozilla.org | ||
#* This lets people know and gives an opportunity for quick feedback | #* This lets people know and gives an opportunity for quick feedback | ||
# Blog/post to dev-planning about the merge | # Blog on the [http://blog.mozilla.com/channels/ channels blog] and post to dev-planning about the merge | ||
#* This lets people know what is going on | #* This lets people know what is going on | ||
=== mozilla-beta → mozilla-release === | === mozilla-beta → mozilla-release === | ||
# Do the merge from mozilla- | # Do the merge from mozilla-beta to mozilla-release | ||
* This should be performed prior to ship day or 'go' to build so that the appropriate mozilla-release changeset can be sent to the release-drivers list (see https://wiki.mozilla.org/Release:Release_Automation_on_Mercurial:Documentation#Sync_mozilla-beta_to_mozilla-release for example script) | |||
* RelEng will sync l10n repos for release | |||
* Ensure that the l10n control files are staying in their state, [browser|mobile]/locales/all-locales, shipped-locales, maemo-locales. | |||
** notably, on desktop, certain locales (eg: csb, mn, sw - but check for current status) should not be in shipped-locales even though they are being built in beta. Confirm with Axel if any new locales that were previously beta-only are now ready for release shipping. | |||
<strike># Starting with 10.0, ensure mobile/{android,xul}/config/mozconfigs/android/* have branding set to release on mozilla-release</strike> <- no longer needed | |||
=== mozilla-aurora → mozilla-beta === | === mozilla-aurora → mozilla-beta === | ||
| Line 34: | Line 41: | ||
# Make sure the version in mozilla-beta can be selected on addons.mozilla.org | # Make sure the version in mozilla-beta can be selected on addons.mozilla.org | ||
# Automatically bump all extensions on addons.mozilla.org from ''[mozilla-beta version]''a1,2 to ''[mozilla-beta version]'' | # Automatically bump all extensions on addons.mozilla.org from ''[mozilla-beta version]''a1,2 to ''[mozilla-beta version]'' | ||
# Ensure that the l10n control files are staying in their state, [browser|mobile]/locales/all-locales, shipped-locales, maemo-locales. | |||
# Starting with 10.0, ensure mobile/{android,xul}/config/mozconfigs/android/* have branding set to beta on mozilla-beta | |||
=== mozilla-central → mozilla-aurora === | === mozilla-central → mozilla-aurora === | ||
# Do the merge from mozilla-central to mozilla-aurora (see [http://mozilla.github.com/process-releases/draft/development_specifics/#branching mechanics]) | # Do the merge from mozilla-central to mozilla-aurora (see [http://mozilla.github.com/process-releases/draft/development_specifics/#branching mechanics]) | ||
# | # No migration of l10n-central to l10n-aurora, if needed the localizers take care of that themselves | ||
# Make sure the version in mozilla-central can be selected on addons.mozilla.org | # Make sure the version in mozilla-central can be selected on addons.mozilla.org | ||
# Make sure the version in mozilla-aurora can be selected on addons.mozilla.org | # Make sure the version in mozilla-aurora can be selected on addons.mozilla.org | ||
# Automatically bump all extensions on addons.mozilla.org from ''[mozilla-aurora version]''a1 to ''[mozilla-aurora version]''a2 | # Automatically bump all extensions on addons.mozilla.org from ''[mozilla-aurora version]''a1 to ''[mozilla-aurora version]''a2 | ||
# Ensure that the l10n control files are staying in their state, [browser|mobile]/locales/all-locales, shipped-locales, maemo-locales. | |||
# Ensure that the [https://addons.mozilla.org/firefox/addon/add-on-compatibility-reporter/ Add-on Compatibility Reporter] maintainers update the addon for the new extensions.checkCompatibility.X.0a value and bump the add-on maxVersion | |||
# Ensure mobile/{android,xul}config/mozconfigs/android/* have branding set to aurora on mozilla-aurora | |||
# Ensure mobile/android/config/mozconfigs/android/l10n-nightly has an l10n-base of '..' (not '../../l10n-central') | |||
=== Announce merging end === | === Announce merging end === | ||
| Line 47: | Line 60: | ||
# Tell the sheriff you are done with the merges | # Tell the sheriff you are done with the merges | ||
# Make an announcement in #developers on irc.mozilla.org | # Make an announcement in #developers on irc.mozilla.org | ||
#* This lets people know and gives an opportunity | #* This lets people know and gives an opportunity to find issues | ||
# Blog/post to dev-planning about the merge | # Blog on the [http://blog.mozilla.com/channels/ channels blog] and post to dev-planning about the merge | ||
#* This lets people know what is going on | #* This lets people know what is going on | ||
# Notify metrics team of the version changes on assorted channels | |||
Latest revision as of 03:11, 1 June 2012
Note: we are going to cherry pick from this page to build the canonical doc here: Release_Management/Merge_Documentation -- so this page is going to become obsolete/removed soon
This is an overall checklist for merging between channel repositories.
Plan
In advance:
- Get web content created and in place
- Write blog announcements to let people know about channel release content
- Try the merges locally and check any conflicts
- Deal with any conflicts / gather information to see if backouts need to stick
Execute
- Check the overall states of all the trees
- We will pull mozilla-central even if it is red and then backout on mozilla-aurora
- mozilla-aurora, mozilla-beta, and mozilla-release should be entirely green
Announce merging start
- Tell the sheriff you are starting the merge
- Make an announcement in #developers on irc.mozilla.org
- This lets people know and gives an opportunity for quick feedback
- Blog on the channels blog and post to dev-planning about the merge
- This lets people know what is going on
mozilla-beta → mozilla-release
- Do the merge from mozilla-beta to mozilla-release
- This should be performed prior to ship day or 'go' to build so that the appropriate mozilla-release changeset can be sent to the release-drivers list (see https://wiki.mozilla.org/Release:Release_Automation_on_Mercurial:Documentation#Sync_mozilla-beta_to_mozilla-release for example script)
- RelEng will sync l10n repos for release
- Ensure that the l10n control files are staying in their state, [browser|mobile]/locales/all-locales, shipped-locales, maemo-locales.
- notably, on desktop, certain locales (eg: csb, mn, sw - but check for current status) should not be in shipped-locales even though they are being built in beta. Confirm with Axel if any new locales that were previously beta-only are now ready for release shipping.
# Starting with 10.0, ensure mobile/{android,xul}/config/mozconfigs/android/* have branding set to release on mozilla-release <- no longer needed
mozilla-aurora → mozilla-beta
- Do the merge from mozilla-aurora to mozilla-beta (see mechanics)
- Do the merge from l10n-aurora to l10n-beta
- Make sure the version in mozilla-beta can be selected on addons.mozilla.org
- Automatically bump all extensions on addons.mozilla.org from [mozilla-beta version]a1,2 to [mozilla-beta version]
- Ensure that the l10n control files are staying in their state, [browser|mobile]/locales/all-locales, shipped-locales, maemo-locales.
- Starting with 10.0, ensure mobile/{android,xul}/config/mozconfigs/android/* have branding set to beta on mozilla-beta
mozilla-central → mozilla-aurora
- Do the merge from mozilla-central to mozilla-aurora (see mechanics)
- No migration of l10n-central to l10n-aurora, if needed the localizers take care of that themselves
- Make sure the version in mozilla-central can be selected on addons.mozilla.org
- Make sure the version in mozilla-aurora can be selected on addons.mozilla.org
- Automatically bump all extensions on addons.mozilla.org from [mozilla-aurora version]a1 to [mozilla-aurora version]a2
- Ensure that the l10n control files are staying in their state, [browser|mobile]/locales/all-locales, shipped-locales, maemo-locales.
- Ensure that the Add-on Compatibility Reporter maintainers update the addon for the new extensions.checkCompatibility.X.0a value and bump the add-on maxVersion
- Ensure mobile/{android,xul}config/mozconfigs/android/* have branding set to aurora on mozilla-aurora
- Ensure mobile/android/config/mozconfigs/android/l10n-nightly has an l10n-base of '..' (not '../../l10n-central')
Announce merging end
- Tell the sheriff you are done with the merges
- Make an announcement in #developers on irc.mozilla.org
- This lets people know and gives an opportunity to find issues
- Blog on the channels blog and post to dev-planning about the merge
- This lets people know what is going on
- Notify metrics team of the version changes on assorted channels