--- a/mozilla/release-firefox-mozilla-release.py
+++ b/mozilla/release-firefox-mozilla-release.py
@@ -16,69 +16,62 @@ 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'] = '41.0.2'
-releaseConfig['appVersion'] = '41.0.2'
+releaseConfig['version'] = '42.0'
+releaseConfig['appVersion'] = '42.0'
releaseConfig['milestone'] = releaseConfig['appVersion']
-releaseConfig['buildNumber'] = 2
-releaseConfig['baseTag'] = 'FIREFOX_41_0_2'
+releaseConfig['buildNumber'] = 1
+releaseConfig['baseTag'] = 'FIREFOX_42_0'
releaseConfig['partialUpdates'] = {
- '40.0.2': {
- 'appVersion': '40.0.2',
- 'buildNumber': 1,
- 'baseTag': 'FIREFOX_40_0_2',
- },
-
- '40.0.3': {
- 'appVersion': '40.0.3',
- 'buildNumber': 1,
- 'baseTag': 'FIREFOX_40_0_3',
+ '41.0.2': {
+ 'appVersion': '41.0.2',
+ 'buildNumber': 2,
+ 'baseTag': 'FIREFOX_41_0_2',
},
'41.0.1': {
'appVersion': '41.0.1',
'buildNumber': 2,
'baseTag': 'FIREFOX_41_0_1',
},
'39.0': {
'appVersion': '39.0',
'buildNumber': 6,
'baseTag': 'FIREFOX_39_0',
},
- '41.0': {
- 'appVersion': '41.0',
- 'buildNumber': 3,
- 'baseTag': 'FIREFOX_41_0',
+ '40.0.3': {
+ 'appVersion': '40.0.3',
+ 'buildNumber': 1,
+ 'baseTag': 'FIREFOX_40_0_3',
},
}
# What's New Page, should be revisited with each release.
-# releaseConfig['openURL'] = 'https://www.mozilla.org/%LOCALE%/firefox/41.0.2/whatsnew/?oldversion=%OLD_VERSION%'
+releaseConfig['openURL'] = 'https://www.mozilla.org/%LOCALE%/firefox/42.0/whatsnew/?oldversion=%OLD_VERSION%'
-# TODO: set this properly when we start shipping win64 on release
-#releaseConfig['HACK_first_released_version'] = {'win64': TBD}
+releaseConfig['HACK_first_released_version'] = {'win64': "42.0"}
# Next (nightly) version info
releaseConfig['nextAppVersion'] = releaseConfig['appVersion']
releaseConfig['nextMilestone'] = releaseConfig['milestone']
# Repository configuration, for tagging
releaseConfig['sourceRepositories'] = {
'mozilla': {
'name': 'mozilla-release',
'path': 'releases/mozilla-release',
- 'revision': '2c279baf0907',
+ 'revision': '82fa2a19a9b9',
'relbranch': None,
'bumpFiles': {
'browser/config/version.txt': {
'version': releaseConfig['appVersion'],
'nextVersion': releaseConfig['nextAppVersion']
},
'browser/config/version_display.txt': {
'version': releaseConfig['appVersion'],
@@ -98,18 +91,17 @@ releaseConfig['l10nRevisionFile'] = '
# Support repositories
releaseConfig['otherReposToTag'] = {
'build/compare-locales': 'RELEASE_AUTOMATION',
'build/buildbot': 'production-0.8',
'build/partner-repacks': 'default',
}
# Platform configuration
-# TODO: add win64 when we're ready to ship it
-releaseConfig['enUSPlatforms'] = ('linux', 'linux64', 'win32', 'macosx64')
+releaseConfig['enUSPlatforms'] = ('linux', 'linux64', 'win32', 'macosx64', "win64")
releaseConfig['notifyPlatforms'] = releaseConfig['enUSPlatforms']
releaseConfig['talosTestPlatforms'] = ()
# Unittests
releaseConfig['unittestPlatforms'] = ()
releaseConfig['enableUnittests'] = False
# L10n configuration
@@ -133,58 +125,59 @@ releaseConfig['releaseNotesUrl'] = N
releaseConfig['testOlderPartials'] = False
releaseConfig['promptWaitTime'] = None
releaseConfig['updateVerifyChunks'] = 6
releaseConfig['mozconfigs'] = {
'linux': 'browser/config/mozconfigs/linux32/release',
'linux64': 'browser/config/mozconfigs/linux64/release',
'macosx64': 'browser/config/mozconfigs/macosx-universal/release',
'win32': 'browser/config/mozconfigs/win32/release',
- #'win64': 'browser/config/mozconfigs/win64/release',
+ 'win64': 'browser/config/mozconfigs/win64/release',
}
releaseConfig["releaseChannel"] = "release"
releaseConfig['updateChannels'] = {
"release": {
"versionRegex": r"^\d+\.\d+(\.\d+)?$",
"ruleId": 145,
"patcherConfig": "mozRelease-branch-patcher2.cfg",
"localTestChannel": "release-localtest",
"cdnTestChannel": "release-cdntest",
"verifyConfigs": {
"linux": "mozRelease-firefox-linux.cfg",
"linux64": "mozRelease-firefox-linux64.cfg",
"macosx64": "mozRelease-firefox-mac64.cfg",
"win32": "mozRelease-firefox-win32.cfg",
- #'win64': 'mozRelease-firefox-win64.cfg',
+ "win64": "mozRelease-firefox-win64.cfg",
},
"testChannels": {
"release-localtest": {
"ruleId": 56,
},
"release-cdntest": {
"ruleId": 57,
},
},
},
"beta": {
- "enabled": False,
+ "enabled": True,
# For the beta channel, we want to able to provide updates to this
# from prior betas or prior RCs that were shipped to the beta channel,
# so this regex matches either.
"versionRegex": r"^(\d+\.\d+(b\d+)?)$",
"ruleId": 32,
"requiresMirrors": False,
"patcherConfig": "mozBeta-branch-patcher2.cfg",
"localTestChannel": "beta-localtest",
"cdnTestChannel": "beta-cdntest",
"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",
},
"marChannelIds": [
"firefox-mozilla-beta",
"firefox-mozilla-release",
],
"testChannels": {
"beta-cdntest": {
"ruleId": 45,
@@ -214,9 +207,9 @@ releaseConfig["svnSshKey"] = "/
releaseConfig['makeIndexFiles'] = True
releaseConfig['use_mock'] = True
releaseConfig['mock_platforms'] = ('linux','linux64')
releaseConfig['ftpSymlinkName'] = 'latest'
releaseConfig['bouncer_aliases'] = {
'Firefox-%(version)s': 'firefox-latest',
'Firefox-%(version)s-stub': 'firefox-stub',
-}
+}
\ No newline at end of file