diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
| commit | 8dd16259287f58f9273002717ec4d27e97127719 (patch) | |
| tree | 3863e62a53829a84037444beab3abd4ed9dfc7d0 /taskcluster/kinds/diffoscope | |
| parent | Releasing progress-linux version 126.0.1-1~progress7.99u1. (diff) | |
| download | firefox-8dd16259287f58f9273002717ec4d27e97127719.tar.xz firefox-8dd16259287f58f9273002717ec4d27e97127719.zip | |
Merging upstream version 127.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | taskcluster/kinds/diffoscope/artifacts.yml (renamed from taskcluster/ci/diffoscope/artifacts.yml) | 6 | ||||
| -rw-r--r-- | taskcluster/kinds/diffoscope/kind.yml (renamed from taskcluster/ci/diffoscope/kind.yml) | 0 | ||||
| -rw-r--r-- | taskcluster/kinds/diffoscope/reproducible.yml (renamed from taskcluster/ci/diffoscope/reproducible.yml) | 0 |
3 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: >- diff --git a/taskcluster/ci/diffoscope/kind.yml b/taskcluster/kinds/diffoscope/kind.yml index 89b38fc665..89b38fc665 100644 --- a/taskcluster/ci/diffoscope/kind.yml +++ b/taskcluster/kinds/diffoscope/kind.yml diff --git a/taskcluster/ci/diffoscope/reproducible.yml b/taskcluster/kinds/diffoscope/reproducible.yml index 4f89bfca4e..4f89bfca4e 100644 --- a/taskcluster/ci/diffoscope/reproducible.yml +++ b/taskcluster/kinds/diffoscope/reproducible.yml |