Bug 1599482 Remove MAR_CHANNEL_ID references in release_to_esr merge r=tomprince

The next merge will mean esr68 doesn't have a confvars.sh that
references these lines, and the current config is broken due to the 'from'
lines not existing in mozilla-release

Differential Revision: https://phabricator.services.mozilla.com/D54756

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Simon Fraser 2019-11-29 17:53:12 +00:00
Родитель d7310ca214
Коммит 62a33810d8
1 изменённых файлов: 0 добавлений и 6 удалений

Просмотреть файл

@ -10,12 +10,6 @@ config = {
],
"replacements": [
# File, from, to
("browser/confvars.sh",
"ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-release",
"ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-esr"),
("browser/confvars.sh",
"MAR_CHANNEL_ID=firefox-mozilla-release",
"MAR_CHANNEL_ID=firefox-mozilla-esr"),
("build/mozconfig.common",
"# Enable enforcing that add-ons are signed by the trusted root",
"# Disable enforcing that add-ons are signed by the trusted root"),