Version bumps for SeaMonkey and Thunderbird a=betamerge,ba=betamerge CLOSED TREE
authorPatrick Cloke <clokep@gmail.com>
Mon, 07 May 2018 17:58:07 -0400
changeset 31883 c31c128cd17ad9aa55edb345ac89d29984e2b262
parent 31882 0a6645934721551fb37713fb5d4680b738184694
child 31884 f547d644566dd2abbc69987bda1129b2b6dcfbc2
push id384
push userclokep@gmail.com
push dateTue, 26 Jun 2018 01:38:29 +0000
reviewersbetamerge
Version bumps for SeaMonkey and Thunderbird a=betamerge,ba=betamerge CLOSED TREE
.taskcluster.yml
client.py
mail/config/mozconfigs/linux32/nightly
mail/config/mozconfigs/linux64/nightly
mail/config/mozconfigs/macosx64/nightly
mail/config/mozconfigs/win32/nightly
mail/config/mozconfigs/win64/nightly
mail/config/version.txt
mail/config/version_display.txt
mail/confvars.sh
mail/locales/shipped-locales
mail/test/mozmill/runtest.py
suite/config/version.txt
--- a/.taskcluster.yml
+++ b/.taskcluster.yml
@@ -91,17 +91,17 @@ tasks:
       retries: 5
 
       payload:
         env:
           # checkout-gecko uses these to check out the source; the inputs
           # to `mach taskgraph decision` are all on the command line.
           $merge:
             - GECKO_BASE_REPOSITORY: 'https://hg.mozilla.org/mozilla-unified'
-              GECKO_HEAD_REPOSITORY: 'https://hg.mozilla.org/mozilla-central'
+              GECKO_HEAD_REPOSITORY: 'https://hg.mozilla.org/releases/mozilla-beta'
               GECKO_HEAD_REF: 'default'
               COMM_BASE_REPOSITORY: 'https://hg.mozilla.org/comm-central'
               COMM_HEAD_REPOSITORY: '${repoUrl}'
               COMM_HEAD_REF: '${push.revision}'
               COMM_HEAD_REV: '${push.revision}'
               HG_STORE_PATH: /buillds/worker/checkouts/hg-store
               TASKCLUSTER_CACHES: /builds/worker/checkouts
             - $if: 'tasks_for != "action"'
--- a/client.py
+++ b/client.py
@@ -8,26 +8,26 @@
 # Define x_REV to override. Where x can be one of:
 #  "COMM", "MOZILLA", "CHATZILLA", "INSPECTOR"
 DEFAULTS = {
     # Global Default Revision
     'REV': "default",
 
     # URL of the default hg repository to clone for ChatZilla.
     'CHATZILLA_REPO': 'https://hg.mozilla.org/chatzilla/',
-    # The stable revision to use for the next branch
-    #  'CHATZILLA_REV':  'SEA2_48_RELBRANCH',
+    # The stable revision to use
+      'CHATZILLA_REV':  'SEA2_48_RELBRANCH',
 
     # URL of the default hg repository to clone for DOM Inspector.
     'INSPECTOR_REPO': 'https://hg.mozilla.org/dom-inspector/',
-    # The stable revision to use for the next branch
-    #  'INSPECTOR_REV':  'DOMI_2_0_17',
+    # The stable revision to use
+      'INSPECTOR_REV':  'DOMI_2_0_17',
 
     # URL of the default hg repository to clone for Mozilla.
-    'MOZILLA_REPO': 'https://hg.mozilla.org/mozilla-central/',
+    'MOZILLA_REPO': 'https://hg.mozilla.org/releases/mozilla-beta/',
 }
 
 REPO_SHORT_NAMES = {
     'mozilla-central':  'moz',
     'dom-inspector':    'dom',
 }
 
 
--- a/mail/config/mozconfigs/linux32/nightly
+++ b/mail/config/mozconfigs/linux32/nightly
@@ -1,14 +1,13 @@
 . "$topsrcdir/build/unix/mozconfig.linux32"
 . "$topsrcdir/build/mozconfig.stylo"
 . "$topsrcdir/comm/mail/config/mozconfigs/common"
 
 ac_add_options --enable-update-channel="${MOZ_UPDATE_CHANNEL}"
-ac_add_options --enable-profiling
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
--- a/mail/config/mozconfigs/linux64/nightly
+++ b/mail/config/mozconfigs/linux64/nightly
@@ -1,14 +1,13 @@
 . "$topsrcdir/build/unix/mozconfig.linux"
 . "$topsrcdir/build/mozconfig.stylo"
 . "$topsrcdir/comm/mail/config/mozconfigs/common"
 
 ac_add_options --enable-update-channel="${MOZ_UPDATE_CHANNEL}"
-ac_add_options --enable-profiling
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
--- a/mail/config/mozconfigs/macosx64/nightly
+++ b/mail/config/mozconfigs/macosx64/nightly
@@ -1,15 +1,14 @@
 . "$topsrcdir/build/macosx/mozconfig.common"
 . "$topsrcdir/build/mozconfig.stylo"
 . "$topsrcdir/comm/mail/config/mozconfigs/common"
 
 ac_add_options --enable-update-channel="${MOZ_UPDATE_CHANNEL}"
 ac_add_options --disable-install-strip
-ac_add_options --enable-profiling
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
--- a/mail/config/mozconfigs/win32/nightly
+++ b/mail/config/mozconfigs/win32/nightly
@@ -1,16 +1,15 @@
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/mozconfig.common"
 . "$topsrcdir/build/mozconfig.stylo"
 . "$topsrcdir/comm/mail/config/mozconfigs/common"
 
 ac_add_options --enable-update-channel="${MOZ_UPDATE_CHANNEL}"
 ac_add_options --enable-jemalloc
-ac_add_options --enable-profiling
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
 export MOZ_TELEMETRY_REPORTING=1
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
--- a/mail/config/mozconfigs/win64/nightly
+++ b/mail/config/mozconfigs/win64/nightly
@@ -1,17 +1,16 @@
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/mozconfig.common"
 . "$topsrcdir/build/mozconfig.stylo"
 . "$topsrcdir/comm/mail/config/mozconfigs/common"
 . "$topsrcdir/comm/mail/config/mozconfigs/win64/common-win64"
 
 ac_add_options --enable-update-channel="${MOZ_UPDATE_CHANNEL}"
 ac_add_options --enable-jemalloc
-ac_add_options --enable-profiling
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
--- a/mail/config/version.txt
+++ b/mail/config/version.txt
@@ -1,1 +1,1 @@
-61.0a1
+61.0
--- a/mail/config/version_display.txt
+++ b/mail/config/version_display.txt
@@ -1,1 +1,1 @@
-61.0a1
+61.0
old mode 100755
new mode 100644
--- a/mail/confvars.sh
+++ b/mail/confvars.sh
@@ -29,19 +29,19 @@ THUNDERBIRD_VERSION=$MOZ_APP_VERSION
 
 MOZ_BRANDING_DIRECTORY=$commreltopsrcdir/mail/branding/nightly
 MOZ_OFFICIAL_BRANDING_DIRECTORY=$commreltopsrcdir/mail/branding/thunderbird
 
 MOZ_APP_ID={3550f703-e582-4d05-9a08-453d09bdfdc6}
 # This should usually be the same as the value MAR_CHANNEL_ID.
 # If more than one ID is needed, then you should use a comma separated list
 # of values.
-ACCEPTED_MAR_CHANNEL_IDS=thunderbird-comm-central
+ACCEPTED_MAR_CHANNEL_IDS=thunderbird-comm-beta,thunderbird-comm-release
 # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
-MAR_CHANNEL_ID=thunderbird-comm-central
+MAR_CHANNEL_ID=thunderbird-comm-beta
 MOZ_PROFILE_MIGRATOR=1
 MOZ_BINARY_EXTENSIONS=1
 MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES=1
 
 # Enable building ./signmar and running libmar signature tests
 MOZ_ENABLE_SIGNMAR=1
 
 MOZ_DEVTOOLS=all
--- a/mail/locales/shipped-locales
+++ b/mail/locales/shipped-locales
@@ -1,1 +1,59 @@
+ar
+ast
+be
+bg
+br
+ca
+cs
+cy
+da
+de
+dsb
+el
+en-GB
 en-US
+es-AR
+es-ES
+et
+eu
+fi
+fr
+fy-NL
+ga-IE
+gd
+gl
+he
+hr
+hsb
+hu
+hy-AM
+id
+is
+it
+ja linux win32
+ja-JP-mac osx
+kab
+kk
+ko
+lt
+ms
+nb-NO
+nl
+nn-NO
+pl
+pt-BR
+pt-PT
+rm
+ro
+ru
+si
+sk
+sl
+sq
+sr
+sv-SE
+tr
+uk
+vi
+zh-CN
+zh-TW
old mode 100755
new mode 100644
--- a/mail/test/mozmill/runtest.py
+++ b/mail/test/mozmill/runtest.py
@@ -99,17 +99,17 @@ class ThunderTestProfile(mozprofile.Thun
         # disable the first use junk dialog
         'mailnews.ui.junk.firstuse': False,
         # set the relative dirs properly
         'mail.root.none-rel' :  "[ProfD]Mail",
         'mail.root.pop3-rel' :  "[ProfD]Mail",
         # Do not allow check new mail to be set
         'mail.startup.enabledMailCheckOnce' :  True,
         # Disable compatibility checking
-        'extensions.checkCompatibility.nightly': False,
+        'extensions.checkCompatibility.61': False,
         # Stop any pings to AMO on add-on install
         'extensions.getAddons.cache.enabled': False,
         # In case a developer is working on a laptop without a network
         # connection, don't detect offline mode; hence we'll still startup
         # online which is what mozmill currently requires. It'll also protect us
         # from any random network failures.
         'offline.autoDetect': False,
         # Don't load what's new or the remote start page - keep everything local
--- a/suite/config/version.txt
+++ b/suite/config/version.txt
@@ -1,1 +1,1 @@
-2.58a1
+2.58