diff options
Diffstat (limited to '')
| -rw-r--r-- | taskcluster/kinds/diffoscope/artifacts.yml (renamed from taskcluster/ci/diffoscope/artifacts.yml) | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/taskcluster/ci/diffoscope/artifacts.yml b/taskcluster/kinds/diffoscope/artifacts.yml index b06604f3cb..a89dfcbfee 100644 --- a/taskcluster/ci/diffoscope/artifacts.yml +++ b/taskcluster/kinds/diffoscope/artifacts.yml @@ -17,8 +17,12 @@ 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 - # artifact builds are not fed with accepted-mar-channel-ids + # 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 + - rm -f {a,b}/"$RESOURCE_DIR"/../MacOS/updater.app/Contents/Frameworks/UpdateSettings.framework/UpdateSettings # Extra diffoscope arguments to account for: # - about:buildconfig being expectedly different. extra-args: >- |