Releases/Merge Checklist

From MozillaWiki
< Releases
Revision as of 21:58, 10 May 2011 by Clegnitto (talk | contribs) (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...")
(diff) ← Older revision | Latest revision (diff) | Newer revision → (diff)
Jump to navigation Jump to search

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

  1. Tell the sheriff you are starting the merge
  2. Make an announcement in #developers on irc.mozilla.org
    • This lets people know and gives an opportunity for quick feedback
  3. Blog/post to dev-planning about the merge, citing changesets
    • This lets people know what is going on

mozilla-beta → mozilla-release

  1. Do the merge from mozilla-aurora to mozilla-beta (see mechanics)

mozilla-aurora → mozilla-beta

  1. Do the merge from mozilla-aurora to mozilla-beta (see mechanics)
  2. Do the merge from l10n-aurora to l10n-beta
  3. Make sure the version in mozilla-beta can be selected on addons.mozilla.org
  4. Automatically bump all extensions on addons.mozilla.org from [mozilla-beta version]a1,2 to [mozilla-beta version]

mozilla-central → mozilla-aurora

  1. Do the merge from mozilla-central to mozilla-aurora (see mechanics)
  2. Do the merge from l10n-central to l10n-aurora
  3. Make sure the version in mozilla-central can be selected on addons.mozilla.org
  4. Make sure the version in mozilla-aurora can be selected on addons.mozilla.org
  5. Automatically bump all extensions on addons.mozilla.org from [mozilla-aurora version]a1 to [mozilla-aurora version]a2

Announce merging end

  1. Tell the sheriff you are done with the merges
  2. Make an announcement in #developers on irc.mozilla.org
    • This lets people know and gives an opportunity for quick feedback / find issues
  3. Blog/post to dev-planning about the merge
    • This lets people know what is going on
Retrieved from "https://wiki.mozilla.org/index.php?title=Releases/Merge_Checklist&oldid=307161"