mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-03 10:33:33 +00:00
Bug 1881662 - Ignore update-settings.ini when it doesn't exist. r=firefox-build-system-reviewers,nalexander
Bug 1848414 removed it from mac builds. Differential Revision: https://phabricator.services.mozilla.com/D202540
This commit is contained in:
parent
8d12f77056
commit
d4bc0694ca
@ -18,7 +18,7 @@ job-defaults:
|
||||
# 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
|
||||
# artifact builds are not fed with accepted-mar-channel-ids
|
||||
- sed -i '/ACCEPTED_MAR_CHANNEL_IDS/d' {a,b}/"$RESOURCE_DIR"/update-settings.ini
|
||||
- if [ -f a/"$RESOURCE_DIR"/update-settings.ini ]; then sed -i '/ACCEPTED_MAR_CHANNEL_IDS/d' {a,b}/"$RESOURCE_DIR"/update-settings.ini; fi
|
||||
# Extra diffoscope arguments to account for:
|
||||
# - about:buildconfig being expectedly different.
|
||||
extra-args: >-
|
||||
|
Loading…
Reference in New Issue
Block a user