forked from mirrors/gecko-dev
Bug 1893552 - Fix diffoscope firefox/update-settings.ini differs. r=firefox-build-system-reviewers,ahochheiden
This was oversight: the line was replaced in https://hg.mozilla.org/mozilla-central/rev/ceddfae53011fce1e8684c43c7bffb427bbd320b and the replacement made macOS-specific in https://hg.mozilla.org/mozilla-central/rev/6042c255bc4097b4722c1f896c07f7a50fe3b8ed. This restores the non-macOS line. Differential Revision: https://phabricator.services.mozilla.com/D208805
This commit is contained in:
parent
c46d67bbf2
commit
1e743db129
1 changed files with 2 additions and 0 deletions
|
|
@ -17,6 +17,8 @@ job-defaults:
|
|||
# bug 1825141 - telemetry.fog.artifact_build isn't stable between
|
||||
# artifact and not-artifact builds, so remove its line if present.
|
||||
- sed -i '/telemetry\.fog\.artifact\_build/d' b/"$RESOURCE_DIR"/browser/defaults/preferences/firefox.js
|
||||
# non-macOS artifact builds are not fed with accepted-mar-channel-ids.
|
||||
- if [ -f a/"$RESOURCE_DIR"/update-settings.ini ]; then sed -i '/ACCEPTED_MAR_CHANNEL_IDS/d' {a,b}/"$RESOURCE_DIR"/update-settings.ini; fi
|
||||
# macOS artifact builds have local update configurations, not Nightly
|
||||
# update configurations.
|
||||
- rm -f {a,b}/"$RESOURCE_DIR"/../Frameworks/ChannelPrefs.framework/ChannelPrefs
|
||||
|
|
|
|||
Loading…
Reference in a new issue