Bug 1510431 - Use display version for version field in buildhub.json r=gps
authorWilliam Lachance <wlachance@mozilla.com>
Fri, 30 Nov 2018 12:13:42 +0000
changeset 505397 75c7af226bcfdeda647e2637064c9792d72af1ac
parent 505396 481a655f835e07fa9e533ba27b92d10ed784f11c
child 505398 b8d320ccbfbc3aab1d59f168c0c9f9bb93bea62d
push id10290
push userffxbld-merge
push dateMon, 03 Dec 2018 16:23:23 +0000
treeherdermozilla-beta@700bed2445e6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1510431
milestone65.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1510431 - Use display version for version field in buildhub.json r=gps Differential Revision: https://phabricator.services.mozilla.com/D13278
toolkit/mozapps/installer/informulate.py
--- a/toolkit/mozapps/installer/informulate.py
+++ b/toolkit/mozapps/installer/informulate.py
@@ -74,17 +74,17 @@ def main():
                 'tree': os.environ['MH_BRANCH'],
                 'revision': s['MOZ_SOURCE_CHANGESET'],
             },
             'target': {
                 'platform': args.pkg_platform,
                 'os': mozinfo.info['os'],
                 # This would be easier if the locale was specified at configure time.
                 'locale': os.environ.get('AB_CD', 'en-US'),
-                'version': s['MOZ_APP_VERSION'],
+                'version': s['MOZ_APP_VERSION_DISPLAY'] or s['MOZ_APP_VERSION'],
                 'channel': s['MOZ_UPDATE_CHANNEL'],
             },
             'download': {
                 # The release pipeline will update these keys.
                 'url': os.path.basename(package),
                 'mimetype': 'application/octet-stream',
                 'date': mtime.isoformat() + 'Z',
                 'size': st.st_size,