--- a/mozilla/l10n-changesets_mozilla-beta
+++ b/mozilla/l10n-changesets_mozilla-beta
@@ -9,17 +9,17 @@ be b72077740aac
bg 8ccd79c7bb10
bn-BD ab9122b22e7b
bn-IN c34378f5de44
br 9ba5179f9d5b
bs 8fc6fcbbced3
ca 79674121b6a7
cs b5fe889eecca
cy 45c4f593fa09
-da e9e0fb5b603d
+da 0aeaf563ec20
de d1acf8ee88de
dsb 84ab9537d71c
el 22b959c9a739
en-GB baafa8ae5a23
en-ZA 720d9153b07b
eo e9724c6eb8c0
es-AR fe65e263f7de
es-CL dca4db35044a
@@ -62,19 +62,19 @@ ms 17c25034aaf5
nb-NO 414019ff03c3
nl ee96cc53b765
nn-NO 9ee047c5de5c
or febd1b04dbfc
pa-IN efd291dbad63
pl 0bc7defff501
pt-BR c304298e3b54
pt-PT 556cc7aa7984
-rm 95078f38fd68
+rm c8395b94d1d8
ro cd2cad15a260
-ru a207c25e0ef4
+ru 47cf494a7e1b
si 48276a49b52b
sk 21fc41fe5bdf
sl 9076fb5c7b38
son 31c0ba307b21
sq 4e01f5f03df6
sr 14b5464929a9
sv-SE fec38cfd5315
ta a252bd8e4ba1
--- a/mozilla/release-firefox-mozilla-beta.py
+++ b/mozilla/release-firefox-mozilla-beta.py
@@ -18,45 +18,48 @@ releaseConfig['releaseTemplates'] = '
releaseConfig['messagePrefix'] = '[release] '
# Basic product configuration
# Names for the product/files
releaseConfig['productName'] = 'firefox'
releaseConfig['stage_product'] = 'firefox'
releaseConfig['appName'] = 'browser'
# Current version info
-releaseConfig['version'] = '36.0b8'
+releaseConfig['version'] = '36.0b9'
releaseConfig['appVersion'] = '36.0'
releaseConfig['milestone'] = releaseConfig['appVersion']
releaseConfig['buildNumber'] = 1
-releaseConfig['baseTag'] = 'FIREFOX_36_0b8'
+releaseConfig['baseTag'] = 'FIREFOX_36_0b9'
releaseConfig['partialUpdates'] = {
'36.0b7': {
'appVersion': '36.0',
'buildNumber': 1,
'baseTag': 'FIREFOX_36_0b7',
},
- '36.0b6': {
+ '36.0b8': {
'appVersion': '36.0',
'buildNumber': 1,
- 'baseTag': 'FIREFOX_36_0b6',
+ 'baseTag': 'FIREFOX_36_0b8',
},
}
+# win64 support
+releaseConfig['HACK_first_released_version'] = {'win64': '37.0b1'}
+
# Next (nightly) version info
releaseConfig['nextAppVersion'] = releaseConfig['appVersion']
releaseConfig['nextMilestone'] = releaseConfig['milestone']
# Repository configuration, for tagging
releaseConfig['sourceRepositories'] = {
'mozilla': {
'name': 'mozilla-beta',
'path': 'releases/mozilla-beta',
- 'revision': '1584db7257a6',
+ 'revision': '57f79302248f',
'relbranch': None,
'bumpFiles': {
'browser/config/version.txt': {
'version': releaseConfig['appVersion'],
'nextVersion': releaseConfig['nextAppVersion']
},
'config/milestone.txt': {
'version': releaseConfig['milestone'],
@@ -73,16 +76,17 @@ releaseConfig['l10nRevisionFile'] = '
releaseConfig['otherReposToTag'] = {
'build/compare-locales': 'RELEASE_AUTOMATION',
'build/buildbot': 'production-0.8',
'build/partner-repacks': 'default',
'build/mozharness': 'production',
}
# Platform configuration
+# TODO: add win64 before 37.0b1
releaseConfig['enUSPlatforms'] = ('linux', 'linux64', 'win32', 'macosx64')
releaseConfig['notifyPlatforms'] = releaseConfig['enUSPlatforms']
releaseConfig['talosTestPlatforms'] = ()
releaseConfig['xulrunnerPlatforms'] = releaseConfig['enUSPlatforms']
# Unittests
releaseConfig['unittestPlatforms'] = ()
releaseConfig['enableUnittests'] = False
@@ -98,40 +102,43 @@ releaseConfig['hgUsername'] = '
releaseConfig['hgSshKey'] = '/home/mock_mozilla/.ssh/ffxbld_rsa'
# Update-specific configuration
releaseConfig['patcherConfig'] = 'mozBeta-branch-patcher2.cfg'
releaseConfig['ftpServer'] = 'ftp.mozilla.org'
releaseConfig['stagingServer'] = 'stage.mozilla.org'
releaseConfig['bouncerServer'] = 'download.mozilla.org'
releaseConfig['ausServerUrl'] = 'https://aus4.mozilla.org'
-releaseConfig['ausHost'] = 'aus3-staging.mozilla.org'
+releaseConfig['ausHost'] = None
releaseConfig['ausUser'] = 'ffxbld'
releaseConfig['ausSshKey'] = 'ffxbld_rsa'
releaseConfig['releaseNotesUrl'] = None
releaseConfig['testOlderPartials'] = False
releaseConfig['promptWaitTime'] = None
releaseConfig['updateVerifyChunks'] = 6
releaseConfig['verifyConfigs'] = {
'linux': 'mozBeta-firefox-linux.cfg',
'linux64': 'mozBeta-firefox-linux64.cfg',
'macosx64': 'mozBeta-firefox-mac64.cfg',
- 'win32': 'mozBeta-firefox-win32.cfg'
+ 'win32': 'mozBeta-firefox-win32.cfg',
+ #'win64': 'mozBeta-firefox-win64.cfg',
}
releaseConfig['mozconfigs'] = {
'linux': 'browser/config/mozconfigs/linux32/beta',
'linux64': 'browser/config/mozconfigs/linux64/beta',
'macosx64': 'browser/config/mozconfigs/macosx-universal/beta',
'win32': 'browser/config/mozconfigs/win32/beta',
+ #'win64': 'browser/config/mozconfigs/win64/beta',
}
releaseConfig['xulrunner_mozconfigs'] = {
'linux': 'xulrunner/config/mozconfigs/linux32/xulrunner',
'linux64': 'xulrunner/config/mozconfigs/linux64/xulrunner',
'macosx64': 'xulrunner/config/mozconfigs/macosx-universal/xulrunner',
'win32': 'xulrunner/config/mozconfigs/win32/xulrunner',
+ #'win64': 'xulrunner/config/mozconfigs/win64/xulrunner',
}
releaseConfig['releaseChannel'] = 'beta'
releaseConfig['releaseChannelRuleIds'] = [32]
releaseConfig['localTestChannel'] = 'beta-localtest'
releaseConfig['cdnTestChannel'] = 'beta-cdntest'
releaseConfig['testChannelRuleIds'] = [25,45]
# Partner repack configuration