Release Management/Merge Days/10-08-2012

From MozillaWiki
Jump to: navigation, search

Mozilla-Beta to Mozilla-Release (Oct 5, 2012)

VERSION=15.0.1
HG_USER="lsblakk <lsblakk@mozilla.com>"
beta_rev=$(hg -R mozilla-beta id -i -r default)
release_rev=$(hg -R mozilla-release id -i -r default)
date +%Y%m%d
RELEASE_BASE_TAG="RELEASE_BASE_`date +%Y%m%d`"
RELEASE_TAG="FIREFOX_RELEASE_$VERSION"
hg -R mozilla-beta tag -r $beta_rev -u "$HG_USER" -m "Added tag $RELEASE_BASE_TAG for changes
hg -R mozilla-beta push ssh://hg.mozilla.org/releases/mozilla-beta
hg -R mozilla-release tag -r $release_rev -u "$HG_USER" -m "Added tag $RELEASE_TAG for change
hg -R mozilla-release commit -u "$HG_USER" -m "Closing old head. CLOSED TREE a=release" --close-branch
hg -R mozilla-release pull mozilla-beta
hg -R mozilla-release up -C default
cd mozilla-release
# took out mn,sw locales as per bug 797387
edit browser/locales/shipped-locales
# updated confvars.sh to release channel
vim browser/confvars.sh
# s/beta/official in mobile mozconfigs
edit mobile/android/config/mozconfigs/*
edit mobile/xul/config/mozconfigs/*
# look over the diff
hg diff
hg -R mozilla-release commit -u "$HG_USER" -m "Updating confvars.sh, mobile mozconfigs, removed mn,sw from shipped locales as per bug 797387 a=release"
hg -R mozilla-release push -f ssh://hg.mozilla.org/releases/mozilla-release

L10n Sync

  • ach locale was already up to date, skipped in merging
  • ran beta2release_l10n.sh

Migration Day: Oct 8, 2012

% hg pull -u
% hg tag FIREFOX_AURORA_18_BASE
% vim browser/config/version.txt
% vim config/milestone.txt
% vim js/src/config/milestone.txt 
% vim mobile/android/confvars.sh
% vim mobile/xul/confvars.sh
% vim b2g/confvars.sh
% vim xpcom/components/Module.h
% vim services/sync/Makefile.in
% hg diff
% hg commit -m "Merging in version bump NO BUG"
% hg out
% hg push
% hg heads
% cd ../mozilla-aurora 
% hg pull -u
% hg head
% hg heads
% hg tag -m "Tagging for mozilla-aurora->mozilla-beta uplift CLOSED TREE" FIREFOX_BETA_17_BASE
% hg out
% hg push
% cd ../mozilla-beta 
% hg pull -u
% hg tag -m "Tagging end of BETA16 CLOSED TREE" FIREFOX_BETA_16_END
% hg commit --close-branch -m 'closing old head CLOSED TREE'
% hg out
% hg heads
% hg push
% hg pull -u -r FIREFOX_BETA_17_BASE http://hg.mozilla.org/releases/mozilla-aurora
% vim browser/config/version.txt
% vim config/milestone.txt
% vim js/src/config/milestone.txt
% vim mobile/android/confvars.sh
% vim mobile/xul/confvars.sh
% hg diff
% hg commit -m "Merging in version bump NO BUG CLOSED TREE"
% hg out
% vim browser/confvars.sh
% vim mobile/android/config/mozconfigs/android/debug 
% vim mobile/android/config/mozconfigs/android/l10n-nightly
% vim mobile/android/config/mozconfigs/android/nightly
% vim mobile/android/config/mozconfigs/android-armv6/debug
% vim mobile/android/config/mozconfigs/android-armv6/l10n-nightly
% vim mobile/android/config/mozconfigs/android-armv6/nightly
% vim mobile/xul/config/mozconfigs/android/debug
% vim mobile/xul/config/mozconfigs/android/nightly
% hg diff
% hg commit -m "Merging in branding changes NO BUG CLOSED TREE"
% hg out | tail
% hg diff browser/locales/all-locales
% hg heads                           
% hg push -f
% cd ../mozilla-aurora 
% hg pull -u
% hg tag -m "Tagging for mozilla-central->mozilla-aurora uplift CLOSED TREE" FIREFOX_AURORA_17_END
% hg commit --close-branch -m 'closing old head CLOSED TREE'
% hg out
% hg push
% hg pull -u -r FIREFOX_AURORA_18_BASE http://hg.mozilla.org/mozilla-central
% vim browser/config/version.txt 
% vim config/milestone.txt
% vim js/src/config/milestone.txt
% vim mobile/android/confvars.sh
% vim mobile/xul/confvars.sh
% hg diff
% hg commit -m "Merging in version bump NO BUG CLOSED TREE"
% vim browser/confvars.sh 
% vim mobile/android/config/mozconfigs/android/debug
% vim mobile/android/config/mozconfigs/android/l10n-nightly
% vim mobile/android/config/mozconfigs/android/nightly
% vim mobile/android/config/mozconfigs/android-armv6/debug
% vim mobile/android/config/mozconfigs/android-armv6/l10n-nightly 
% vim mobile/android/config/mozconfigs/android-armv6/nightly
% vim mobile/xul/config/mozconfigs/android/debug
% vim mobile/xul/config/mozconfigs/android/nightly
% hg diff
% hg commit -m "Merging in branding changes NO BUG CLOSED TREE"
% for file in `find browser/config/mozconfigs -type f -name nightly`; do sed -i -e '/enable-profiling/d' $file; done
% hg diff
% 
% hg commit -m "Disable profiling on Aurora NO BUG CLOSED TREE"
% hg push -f