Thunderbird/Release Driving/Rapid Release Activities/Merge Repositories: Difference between revisions

Jump to navigation Jump to search

Thunderbird/Release Driving/Rapid Release Activities/Merge Repositories (view source)

Revision as of 19:22, 30 March 2015

976 bytes added ,  30 March 2015
Finish major update
m (Fix some list formatting)
(Finish major update)
Line 78: Line 78:
   hg -R beta push
   hg -R beta push


* and the release builds (we generally haven't clobbered these as SeaMonkey's clobberer hasn't been up and running)
* and the release changes (we generally haven't clobbered these as SeaMonkey's clobberer hasn't been up and running)


   hg -R release push -f
   hg -R release push -f
* Remember, comm-beta stays closed until after the comm-aurora -> comm-beta merges have completed on Merge day (and its built).


=== comm-aurora -> comm-beta merge ===
=== comm-aurora -> comm-beta merge ===


Run the script
* Close the relevant trees
* Reset the repos (this removes any previous repository & creates a fresh clone)


./merge-aurora-2-beta.sh &>aurora2beta.log
  ./resetmainrepos.sh
less aurora2beta.log


When viewing the log check for:
* Run the script


* Outgoing tag to comm-aurora
  ./merge-aurora-2-beta.sh &> aurora2beta.log
* The diff of changes committed to comm-beta looks OK
  less aurora2beta.log
* The outgoing changes to comm-beta look ok, including closing of the old head, and tagging at the start and end of the list.


When ready:
* Check the log for:
** Any errors
** Outgoing tag to comm-aurora
** The diff of changes committed to comm-beta looks OK
** The outgoing changes to comm-beta look ok, including closing of the old head, and tagging at the start and end of the list.
* Now push the aurora tag (this doesn't cause any builds, as it doesn't change anything)


hg push -R aurora
  hg -R aurora push


This won't cause anything to build, but will push the tag.
* Clobber the beta builds via [https://api.pub.build.mozilla.org/clobberer/?branch=comm-beta clobberer]
* and then push the beta changes


{{Note|It is best if the next part is done in association with the mozilla-aurora to mozilla-beta merge}}
  hg -R beta push -f


Clobber the comm-beta builds using [https://build.mozilla.org/clobberer/?branch=comm-beta clobberer]
* comm-aurora doesn't get set back to approval required until after comm-central -> comm-aurora merge and builds are completed
 
* comm-beta doesn't get set back to approval required until after builds are completed
Then push to comm-beta:
 
hg push -R beta -f
 
Once the builders have run, check that you still have green builds.


=== comm-central -> comm-aurora merge ===
=== comm-central -> comm-aurora merge ===


Run the script
* Close the relevant trees, if not already)
* You don't need to do a reset of the repos for this step if you closed the trees before the comm-aurora -> comm-beta merge and no pushes have happened.
* Run the script


./merge-central-2-aurora.sh &>central2aurora.log
  ./merge-central-2-aurora.sh &> central2aurora.log
less central2aurora.log
  less central2aurora.log


When viewing the log check for:
* Check the log for:
** Any errors
** Outgoing tag to comm-central
** The diff of changes committed to comm-aurora looks OK
** The outgoing changes to comm-aurora look ok, including closing of the old head, and tagging at the start and end of the list.
* Now push the central tag (this doesn't cause any builds, as it doesn't change anything)


* Outgoing tag to comm-central
  hg -R central push
* The diff of changes committed to comm-aurora looks OK
* The outgoing changes to comm-aurora look ok, including closing of the old head, and tagging at the start and end of the list.


When ready:
* Clobber the aurora builds via [https://api.pub.build.mozilla.org/clobberer/?branch=comm-aurora clobberer]
* and then push the aurora changes


hg push -R central
  hg -R aurora push -f


{{Note|It is best if the next part is done in association with the mozilla-aurora to mozilla-beta merge}}
* For comm-central, the version bumps now need to happen. First, cd into the directory:


Clobber the comm-aurora builds using [https://build.mozilla.org/clobberer/?branch=comm-aurora clobberer]
cd central
hg update -r default


Then push to comm-aurora:
* Bump the versions in the following files (look at the history if you're unsure of the standard bumps):


  hg push -R aurora -f
  central/mail/config/version.txt
central/suite/config/version.txt


Once the builders have run, check that you still have green builds.
* Commit the version changes with a message: "Version bumps for SeaMonkey and Thunderbird a=auroramerge CLOSED TREE" (note we don't use DONTBUILD to force a cycle through the builders in case there's an issue with tests relying on particular version numbers).
* Push the result.


== Central version bumps ==
  hg push
 
Bump the versions in
 
central/mail/config/version.txt
central/suite/config/version.txt


and commit with a message like "Version bumps for SeaMonkey and Thunderbird a=auroramerge".
* comm-central can be re-opened if appropriate.
* comm-aurora doesn't get set back to approval required until after builds are completed


== Post-Merge tidy ==
== Post-Merge tidy ==


Please commit and push any changes to the drivertools repo, for history purposes.
Please commit and push any changes to the drivertools repo, for history purposes.
Standard8
canmove, Confirmed users, Bureaucrats and Sysops emeriti
3,627

edits

Retrieved from "https://wiki.allizom.org/Special:MobileDiff/1065267"

Navigation menu