From d4bc0694ca0d544997ced1d1852268721fcf37b4 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Fri, 23 Feb 2024 04:42:09 +0000 Subject: [PATCH] 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 --- taskcluster/ci/diffoscope/artifacts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taskcluster/ci/diffoscope/artifacts.yml b/taskcluster/ci/diffoscope/artifacts.yml index 0e901f50fd21..b06604f3cbcd 100644 --- a/taskcluster/ci/diffoscope/artifacts.yml +++ b/taskcluster/ci/diffoscope/artifacts.yml @@ -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: >-