зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1469595
- Android single locale (not nightly) broken on beta. r=rail
Differential Revision: https://phabricator.services.mozilla.com/D1703
This commit is contained in:
Родитель
996e1783ef
Коммит
fa608470a1
|
@ -103,18 +103,17 @@ class MobileSingleLocale(LocalesMixin, TooltoolMixin, AutomationMixin,
|
|||
return self.repack_env
|
||||
c = self.config
|
||||
repack_env = self.query_env(partial_env=c.get("repack_env"))
|
||||
if self.query_is_nightly() or self.query_is_nightly_promotion():
|
||||
if self.query_is_nightly():
|
||||
# Nightly promotion needs to set update_channel but not do all
|
||||
# the 'IS_NIGHTLY' automation parts, like uploading symbols
|
||||
# (for now).
|
||||
repack_env["IS_NIGHTLY"] = "yes"
|
||||
# In branch_specifics.py we might set update_channel explicitly.
|
||||
if c.get('update_channel'):
|
||||
repack_env["MOZ_UPDATE_CHANNEL"] = c['update_channel']
|
||||
else: # Let's just give the generic channel based on branch.
|
||||
repack_env["MOZ_UPDATE_CHANNEL"] = \
|
||||
"nightly-%s" % (c['branch'],)
|
||||
if self.query_is_nightly():
|
||||
# Nightly promotion needs to set update_channel but not do all
|
||||
# the 'IS_NIGHTLY' automation parts, like uploading symbols
|
||||
# (for now).
|
||||
repack_env["IS_NIGHTLY"] = "yes"
|
||||
# In branch_specifics.py we might set update_channel explicitly.
|
||||
if c.get('update_channel'):
|
||||
repack_env["MOZ_UPDATE_CHANNEL"] = c['update_channel']
|
||||
else: # Let's just give the generic channel based on branch.
|
||||
repack_env["MOZ_UPDATE_CHANNEL"] = \
|
||||
"nightly-%s" % (c['branch'],)
|
||||
|
||||
self.repack_env = repack_env
|
||||
return self.repack_env
|
||||
|
|
Загрузка…
Ссылка в новой задаче