From 7a72112b1a27555d4436d03bc67d70a80e65f4c7 Mon Sep 17 00:00:00 2001 From: Krzysztof Modras <1228153+chrmod@users.noreply.github.com> Date: Wed, 5 Jun 2024 16:31:29 +0200 Subject: [PATCH] 2024.5.1 (#689) --- .workspace | 10 +-- README.md | 8 +- build/Linux.dockerfile | 20 ++--- build/MacOSARM.dockerfile | 30 ++++---- build/MacOSX.dockerfile | 30 ++++---- build/Windows.dockerfile | 26 +++---- build/WindowsARM.dockerfile | 26 +++---- build/configs/macosx-aarch64.mozconfig | 4 +- build/configs/macosx.mozconfig | 2 +- build/fetch-content | 10 +-- ci.multibranch.Jenkinsfile | 4 +- ci/build-helpers.groovy | 4 +- fern/commands/build.js | 16 ++-- fern/commands/config.js | 12 ++- fern/core/docker.js | 6 +- patches/.index | 1 + .../0003-Update-text-in-about-dialog.patch | 14 ++-- patches/0018-Ghostery-Theme.patch | 33 +++++---- .../0040-Disable-experiments-reporting.patch | 73 +++++++++++++++++++ 19 files changed, 204 insertions(+), 125 deletions(-) create mode 100644 patches/0040-Disable-experiments-reporting.patch diff --git a/.workspace b/.workspace index 36cf3acb12..5357c75d58 100644 --- a/.workspace +++ b/.workspace @@ -1,6 +1,6 @@ { "addons": { - "ghostery": "https://github.com/ghostery/ghostery-extension/releases/download/v10.3.2/ghostery-firefox.zip", + "ghostery": "https://github.com/ghostery/ghostery-extension/releases/download/v10.3.3/ghostery-firefox.zip", "ghostery-search": "https://github.com/ghostery/ghostery-search-extension/releases/download/v2.0.0/ghostery_private_search-2.0.0.zip", "ghostery-newtab": "https://github.com/ghostery/ghostery-newtab-extension/releases/download/v1.0.2/ghostery_new_tab-1.0.2.zip" }, @@ -10,11 +10,11 @@ "pictureinpicture", "report-site-issue" ], - "firefox": "125.0.3", - "app": "2024.05", + "firefox": "126.0", + "app": "2024.05.1", "s3bucket": "ghostery-user-agent-cache-public", "locales": { - "de": "3554b47092ee0879c578a4d22053c2ea33570d03", - "fr": "a67337b0c59cb9c0703a3c932cf1bc47a66c4ad8" + "de": "467cfd37c3bdf242b76a72d901ac0a80306d3e0b", + "fr": "496c2eb73b82d5bb7fc3a10ccd159f3df0d76e7c" } } diff --git a/README.md b/README.md index b0b568690b..eb9b608930 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ we provide dockerised builds. These can be run using the `fern.js build` command Windows and Mac builds depend on platform frameworks being included. These should be placed in the `build` directory: - * Mac: `MacOSX14.2.sdk.tar.xz`. This can be found inside an XCode install. + * Mac: `MacOSX14.4.sdk.tar.xz`. This can be found inside an XCode install. * Windows: `vs.tar.zstd` and `Makecab.exe`. See the end of this document to where to find these. ## Development workflow @@ -140,12 +140,12 @@ Alternatively, the `build-*` scripts in this repo will prepare docker images wit ### VS Redist This can be built on windows after setting up a build environment as per [these instructions](https://firefox-source-docs.mozilla.org/setup/windows_build.html#building-firefox-on-windows). -You will need to install the Windows 10 SDK at version `14.29.30133`. Then run the following to create `vs2019_14.29.30133.tar.bz2`: +You will need to install the Windows 11 SDK at version `10.0.22621`. Then run the following to create `vs.tar.zstd`: ```bash OUTPUT_DIR=PATH_TO_TEMP_FOLDER -./mach python --virtualenv build taskcluster/scripts/misc/get_vs.py ./build/vs/vs2019.yaml $OUTPUT_DIR -tar --zstd -cvjSf vs2019_14.29.30133.bz2 -C $OUTPUT_DIR . +./mach python --virtualenv build taskcluster/scripts/misc/get_vs.py ./build/vs/vs2022.yaml $OUTPUT_DIR +tar --zstd -cvSf vs.tar.zstd -C $OUTPUT_DIR . ``` ### Makecab.exe diff --git a/build/Linux.dockerfile b/build/Linux.dockerfile index ef9b29bd1b..477e15cc1a 100644 --- a/build/Linux.dockerfile +++ b/build/Linux.dockerfile @@ -3,52 +3,52 @@ FROM ua-build-base ENV MOZ_AUTOMATION_PACKAGE_TESTS="1" \ MOZ_ENABLE_FULL_SYMBOLS="1" -RUN wget -nv -O /builds/worker/fetches/clang.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/linux64-clang-17/clang.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/clang.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/linux64-clang-17/clang.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf clang.tar.zst && \ rm clang.tar.zst -RUN wget -nv -O /builds/worker/fetches/rustc.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/linux64-rust-1.76/rustc.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/rustc.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/linux64-rust-1.77/rustc.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf rustc.tar.zst && \ rm rustc.tar.zst -RUN wget -nv -O /builds/worker/fetches/rust-size.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/linux64-rust-size/rust-size.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/rust-size.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/linux64-rust-size/rust-size.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf rust-size.tar.zst && \ rm rust-size.tar.zst -RUN wget -nv -O /builds/worker/fetches/cbindgen.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/linux64-cbindgen/cbindgen.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/cbindgen.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/linux64-cbindgen/cbindgen.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf cbindgen.tar.zst && \ rm cbindgen.tar.zst -RUN wget -nv -O /builds/worker/fetches/dump_syms.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/linux64-dump_syms/dump_syms.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/dump_syms.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/linux64-dump_syms/dump_syms.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf dump_syms.tar.zst && \ rm dump_syms.tar.zst -RUN wget -nv -O /builds/worker/fetches/nasm.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/linux64-nasm/nasm.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/nasm.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/linux64-nasm/nasm.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf nasm.tar.zst && \ rm nasm.tar.zst -RUN wget -nv -O /builds/worker/fetches/node.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/linux64-node-18/node.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/node.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/linux64-node-18/node.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf node.tar.zst && \ rm node.tar.zst -RUN wget -nv -O /builds/worker/fetches/pkgconf.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/linux64-pkgconf/pkgconf.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/pkgconf.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/linux64-pkgconf/pkgconf.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf pkgconf.tar.zst && \ rm pkgconf.tar.zst -RUN wget -nv -O /builds/worker/fetches/sysroot-x86_64-linux-gnu.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/sysroot-x86_64-linux-gnu/sysroot-x86_64-linux-gnu.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/sysroot-x86_64-linux-gnu.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/sysroot-x86_64-linux-gnu/sysroot-x86_64-linux-gnu.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf sysroot-x86_64-linux-gnu.tar.zst && \ rm sysroot-x86_64-linux-gnu.tar.zst -RUN wget -nv -O /builds/worker/fetches/sysroot-wasm32-wasi.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/sysroot-wasm32-wasi-clang-17/sysroot-wasm32-wasi.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/sysroot-wasm32-wasi.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/sysroot-wasm32-wasi-clang-17/sysroot-wasm32-wasi.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf sysroot-wasm32-wasi.tar.zst && \ rm sysroot-wasm32-wasi.tar.zst diff --git a/build/MacOSARM.dockerfile b/build/MacOSARM.dockerfile index 5cda7cefac..8dd6fd5901 100644 --- a/build/MacOSARM.dockerfile +++ b/build/MacOSARM.dockerfile @@ -3,71 +3,71 @@ FROM ua-build-base ENV MOZ_AUTOMATION_PACKAGE_TESTS="1" \ PERFHERDER_EXTRA_OPTIONS="aarch64" -RUN wget -nv -O /builds/worker/fetches/cctools.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/linux64-cctools-port/cctools.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/cctools.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/linux64-cctools-port/cctools.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf cctools.tar.zst && \ rm cctools.tar.zst -RUN wget -nv -O /builds/worker/fetches/clang.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/linux64-clang-17/clang.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/clang.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/linux64-clang-17/clang.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf clang.tar.zst && \ rm clang.tar.zst -RUN wget -nv -O /builds/worker/fetches/sysroot-wasm32-wasi.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/sysroot-wasm32-wasi-clang-17/sysroot-wasm32-wasi.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/sysroot-wasm32-wasi.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/sysroot-wasm32-wasi-clang-17/sysroot-wasm32-wasi.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf sysroot-wasm32-wasi.tar.zst && \ rm sysroot-wasm32-wasi.tar.zst -RUN wget -nv -O /builds/worker/fetches/dump_syms.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/linux64-dump_syms/dump_syms.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/dump_syms.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/linux64-dump_syms/dump_syms.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf dump_syms.tar.zst && \ rm dump_syms.tar.zst -RUN wget -nv -O /builds/worker/fetches/hfsplus.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/linux64-hfsplus/hfsplus.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/hfsplus.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/linux64-hfsplus/hfsplus.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf hfsplus.tar.zst && \ rm hfsplus.tar.zst -RUN wget -nv -O /builds/worker/fetches/dmg.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/linux64-libdmg/dmg.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/dmg.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/linux64-libdmg/dmg.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf dmg.tar.zst && \ rm dmg.tar.zst -RUN wget -nv -O /builds/worker/fetches/rustc.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/linux64-rust-macos-1.76/rustc.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/rustc.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/linux64-rust-macos-1.77/rustc.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf rustc.tar.zst && \ rm rustc.tar.zst -RUN wget -nv -O /builds/worker/fetches/rust-size.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/linux64-rust-size/rust-size.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/rust-size.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/linux64-rust-size/rust-size.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf rust-size.tar.zst && \ rm rust-size.tar.zst -RUN wget -nv -O /builds/worker/fetches/cbindgen.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/linux64-cbindgen/cbindgen.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/cbindgen.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/linux64-cbindgen/cbindgen.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf cbindgen.tar.zst && \ rm cbindgen.tar.zst -RUN wget -nv -O /builds/worker/fetches/nasm.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/linux64-nasm/nasm.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/nasm.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/linux64-nasm/nasm.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf nasm.tar.zst && \ rm nasm.tar.zst -RUN wget -nv -O /builds/worker/fetches/node.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/linux64-node-18/node.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/node.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/linux64-node-18/node.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf node.tar.zst && \ rm node.tar.zst -RUN wget -nv -O /builds/worker/fetches/sysroot-x86_64-linux-gnu.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/sysroot-x86_64-linux-gnu/sysroot-x86_64-linux-gnu.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/sysroot-x86_64-linux-gnu.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/sysroot-x86_64-linux-gnu/sysroot-x86_64-linux-gnu.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf sysroot-x86_64-linux-gnu.tar.zst && \ rm sysroot-x86_64-linux-gnu.tar.zst -COPY MacOSX14.2.sdk.tar.xz /builds/worker/fetches/ +COPY MacOSX14.4.sdk.tar.xz /builds/worker/fetches/ RUN cd /builds/worker/fetches/ && \ - tar -xf MacOSX14.2.sdk.tar.xz && \ - rm MacOSX14.2.sdk.tar.xz + tar -xf MacOSX14.4.sdk.tar.xz && \ + rm MacOSX14.4.sdk.tar.xz ENV MOZ_FETCHES_DIR=/builds/worker/fetches/ \ GECKO_PATH=/builds/worker/workspace \ diff --git a/build/MacOSX.dockerfile b/build/MacOSX.dockerfile index 130a6dd3b6..a725873998 100644 --- a/build/MacOSX.dockerfile +++ b/build/MacOSX.dockerfile @@ -2,71 +2,71 @@ FROM ua-build-base ENV MOZ_AUTOMATION_PACKAGE_TESTS="1" -RUN wget -nv -O /builds/worker/fetches/cctools.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/linux64-cctools-port/cctools.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/cctools.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/linux64-cctools-port/cctools.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf cctools.tar.zst && \ rm cctools.tar.zst -RUN wget -nv -O /builds/worker/fetches/clang.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/linux64-clang-17/clang.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/clang.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/linux64-clang-17/clang.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf clang.tar.zst && \ rm clang.tar.zst -RUN wget -nv -O /builds/worker/fetches/sysroot-wasm32-wasi.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/sysroot-wasm32-wasi-clang-17/sysroot-wasm32-wasi.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/sysroot-wasm32-wasi.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/sysroot-wasm32-wasi-clang-17/sysroot-wasm32-wasi.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf sysroot-wasm32-wasi.tar.zst && \ rm sysroot-wasm32-wasi.tar.zst -RUN wget -nv -O /builds/worker/fetches/dump_syms.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/linux64-dump_syms/dump_syms.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/dump_syms.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/linux64-dump_syms/dump_syms.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf dump_syms.tar.zst && \ rm dump_syms.tar.zst -RUN wget -nv -O /builds/worker/fetches/hfsplus.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/linux64-hfsplus/hfsplus.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/hfsplus.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/linux64-hfsplus/hfsplus.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf hfsplus.tar.zst && \ rm hfsplus.tar.zst -RUN wget -nv -O /builds/worker/fetches/dmg.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/linux64-libdmg/dmg.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/dmg.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/linux64-libdmg/dmg.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf dmg.tar.zst && \ rm dmg.tar.zst -RUN wget -nv -O /builds/worker/fetches/rustc.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/linux64-rust-macos-1.76/rustc.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/rustc.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/linux64-rust-macos-1.77/rustc.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf rustc.tar.zst && \ rm rustc.tar.zst -RUN wget -nv -O /builds/worker/fetches/rust-size.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/linux64-rust-size/rust-size.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/rust-size.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/linux64-rust-size/rust-size.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf rust-size.tar.zst && \ rm rust-size.tar.zst -RUN wget -nv -O /builds/worker/fetches/cbindgen.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/linux64-cbindgen/cbindgen.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/cbindgen.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/linux64-cbindgen/cbindgen.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf cbindgen.tar.zst && \ rm cbindgen.tar.zst -RUN wget -nv -O /builds/worker/fetches/nasm.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/linux64-nasm/nasm.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/nasm.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/linux64-nasm/nasm.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf nasm.tar.zst && \ rm nasm.tar.zst -RUN wget -nv -O /builds/worker/fetches/node.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/linux64-node-18/node.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/node.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/linux64-node-18/node.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf node.tar.zst && \ rm node.tar.zst -RUN wget -nv -O /builds/worker/fetches/sysroot-x86_64-linux-gnu.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/sysroot-x86_64-linux-gnu/sysroot-x86_64-linux-gnu.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/sysroot-x86_64-linux-gnu.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/sysroot-x86_64-linux-gnu/sysroot-x86_64-linux-gnu.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf sysroot-x86_64-linux-gnu.tar.zst && \ rm sysroot-x86_64-linux-gnu.tar.zst -COPY MacOSX14.2.sdk.tar.xz /builds/worker/fetches/ +COPY MacOSX14.4.sdk.tar.xz /builds/worker/fetches/ RUN cd /builds/worker/fetches/ && \ - tar -xf MacOSX14.2.sdk.tar.xz && \ - rm MacOSX14.2.sdk.tar.xz + tar -xf MacOSX14.4.sdk.tar.xz && \ + rm MacOSX14.4.sdk.tar.xz ENV MOZ_FETCHES_DIR=/builds/worker/fetches/ \ GECKO_PATH=/builds/worker/workspace \ diff --git a/build/Windows.dockerfile b/build/Windows.dockerfile index 0df3a38732..0e732059db 100644 --- a/build/Windows.dockerfile +++ b/build/Windows.dockerfile @@ -11,67 +11,67 @@ RUN /builds/worker/bin/fetch-content static-url \ unzip upx-3.95-win64.zip && \ rm upx-3.95-win64.zip -RUN wget -nv -O /builds/worker/fetches/clang.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/linux64-clang-17/clang.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/clang.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/linux64-clang-17/clang.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf clang.tar.zst && \ rm clang.tar.zst -RUN wget -nv -O /builds/worker/fetches/rustc.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/linux64-rust-cross-1.76/rustc.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/rustc.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/linux64-rust-cross-1.77/rustc.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf rustc.tar.zst && \ rm rustc.tar.zst -RUN wget -nv -O /builds/worker/fetches/rust-size.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/linux64-rust-size/rust-size.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/rust-size.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/linux64-rust-size/rust-size.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf rust-size.tar.zst && \ rm rust-size.tar.zst -RUN wget -nv -O /builds/worker/fetches/nasm.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/linux64-nasm/nasm.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/nasm.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/linux64-nasm/nasm.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf nasm.tar.zst && \ rm nasm.tar.zst -RUN wget -nv -O /builds/worker/fetches/node.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/linux64-node-18/node.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/node.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/linux64-node-18/node.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf node.tar.zst && \ rm node.tar.zst -RUN wget -nv -O /builds/worker/fetches/cbindgen.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/linux64-cbindgen/cbindgen.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/cbindgen.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/linux64-cbindgen/cbindgen.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf cbindgen.tar.zst && \ rm cbindgen.tar.zst -RUN wget -nv -O /builds/worker/fetches/dump_syms.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/linux64-dump_syms/dump_syms.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/dump_syms.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/linux64-dump_syms/dump_syms.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf dump_syms.tar.zst && \ rm dump_syms.tar.zst -RUN wget -nv -O /builds/worker/fetches/wine.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/linux64-wine/wine.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/wine.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/linux64-wine/wine.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf wine.tar.zst && \ rm wine.tar.zst -RUN wget -nv -O /builds/worker/fetches/winchecksec.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/linux64-winchecksec/winchecksec.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/winchecksec.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/linux64-winchecksec/winchecksec.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf winchecksec.tar.zst && \ rm winchecksec.tar.zst -RUN wget -nv -O /builds/worker/fetches/nsis.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/nsis/nsis.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/nsis.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/nsis/nsis.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf nsis.tar.zst && \ rm nsis.tar.zst -RUN wget -nv -O /builds/worker/fetches/sysroot-x86_64-linux-gnu.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/sysroot-x86_64-linux-gnu/sysroot-x86_64-linux-gnu.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/sysroot-x86_64-linux-gnu.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/sysroot-x86_64-linux-gnu/sysroot-x86_64-linux-gnu.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf sysroot-x86_64-linux-gnu.tar.zst && \ rm sysroot-x86_64-linux-gnu.tar.zst -RUN wget -nv -O /builds/worker/fetches/sysroot-wasm32-wasi.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/sysroot-wasm32-wasi-clang-17/sysroot-wasm32-wasi.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/sysroot-wasm32-wasi.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/sysroot-wasm32-wasi-clang-17/sysroot-wasm32-wasi.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf sysroot-wasm32-wasi.tar.zst && \ rm sysroot-wasm32-wasi.tar.zst -RUN wget -nv -O /builds/worker/fetches/windows-rs.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/windows-rs/windows-rs.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/windows-rs.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/windows-rs/windows-rs.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf windows-rs.tar.zst && \ rm windows-rs.tar.zst diff --git a/build/WindowsARM.dockerfile b/build/WindowsARM.dockerfile index 0df3a38732..0e732059db 100644 --- a/build/WindowsARM.dockerfile +++ b/build/WindowsARM.dockerfile @@ -11,67 +11,67 @@ RUN /builds/worker/bin/fetch-content static-url \ unzip upx-3.95-win64.zip && \ rm upx-3.95-win64.zip -RUN wget -nv -O /builds/worker/fetches/clang.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/linux64-clang-17/clang.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/clang.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/linux64-clang-17/clang.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf clang.tar.zst && \ rm clang.tar.zst -RUN wget -nv -O /builds/worker/fetches/rustc.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/linux64-rust-cross-1.76/rustc.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/rustc.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/linux64-rust-cross-1.77/rustc.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf rustc.tar.zst && \ rm rustc.tar.zst -RUN wget -nv -O /builds/worker/fetches/rust-size.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/linux64-rust-size/rust-size.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/rust-size.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/linux64-rust-size/rust-size.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf rust-size.tar.zst && \ rm rust-size.tar.zst -RUN wget -nv -O /builds/worker/fetches/nasm.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/linux64-nasm/nasm.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/nasm.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/linux64-nasm/nasm.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf nasm.tar.zst && \ rm nasm.tar.zst -RUN wget -nv -O /builds/worker/fetches/node.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/linux64-node-18/node.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/node.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/linux64-node-18/node.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf node.tar.zst && \ rm node.tar.zst -RUN wget -nv -O /builds/worker/fetches/cbindgen.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/linux64-cbindgen/cbindgen.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/cbindgen.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/linux64-cbindgen/cbindgen.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf cbindgen.tar.zst && \ rm cbindgen.tar.zst -RUN wget -nv -O /builds/worker/fetches/dump_syms.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/linux64-dump_syms/dump_syms.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/dump_syms.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/linux64-dump_syms/dump_syms.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf dump_syms.tar.zst && \ rm dump_syms.tar.zst -RUN wget -nv -O /builds/worker/fetches/wine.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/linux64-wine/wine.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/wine.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/linux64-wine/wine.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf wine.tar.zst && \ rm wine.tar.zst -RUN wget -nv -O /builds/worker/fetches/winchecksec.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/linux64-winchecksec/winchecksec.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/winchecksec.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/linux64-winchecksec/winchecksec.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf winchecksec.tar.zst && \ rm winchecksec.tar.zst -RUN wget -nv -O /builds/worker/fetches/nsis.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/nsis/nsis.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/nsis.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/nsis/nsis.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf nsis.tar.zst && \ rm nsis.tar.zst -RUN wget -nv -O /builds/worker/fetches/sysroot-x86_64-linux-gnu.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/sysroot-x86_64-linux-gnu/sysroot-x86_64-linux-gnu.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/sysroot-x86_64-linux-gnu.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/sysroot-x86_64-linux-gnu/sysroot-x86_64-linux-gnu.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf sysroot-x86_64-linux-gnu.tar.zst && \ rm sysroot-x86_64-linux-gnu.tar.zst -RUN wget -nv -O /builds/worker/fetches/sysroot-wasm32-wasi.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/sysroot-wasm32-wasi-clang-17/sysroot-wasm32-wasi.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/sysroot-wasm32-wasi.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/sysroot-wasm32-wasi-clang-17/sysroot-wasm32-wasi.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf sysroot-wasm32-wasi.tar.zst && \ rm sysroot-wasm32-wasi.tar.zst -RUN wget -nv -O /builds/worker/fetches/windows-rs.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/125.0.3/windows-rs/windows-rs.tar.zst && \ +RUN wget -nv -O /builds/worker/fetches/windows-rs.tar.zst https://ghostery-user-agent-cache-public.s3.amazonaws.com/toolchains/126.0/windows-rs/windows-rs.tar.zst && \ cd /builds/worker/fetches/ && \ tar -xf windows-rs.tar.zst && \ rm windows-rs.tar.zst diff --git a/build/configs/macosx-aarch64.mozconfig b/build/configs/macosx-aarch64.mozconfig index 293829be74..196aec965d 100644 --- a/build/configs/macosx-aarch64.mozconfig +++ b/build/configs/macosx-aarch64.mozconfig @@ -16,7 +16,7 @@ mk_add_options "export PATH=$MOZ_FETCHES_DIR/cctools/bin:$MOZ_FETCHES_DIR/binuti # dsymutil needs a libstdc++ more recent than what's on the system. mk_add_options "export LD_LIBRARY_PATH=$MOZ_FETCHES_DIR/clang/lib" -CROSS_SYSROOT=$MOZ_FETCHES_DIR/MacOSX14.2.sdk +CROSS_SYSROOT=$MOZ_FETCHES_DIR/MacOSX14.4.sdk export CC="$MOZ_FETCHES_DIR/clang/bin/clang" export CXX="$MOZ_FETCHES_DIR/clang/bin/clang++" @@ -33,7 +33,7 @@ export HOST_CXXFLAGS="-g" export HOST_LDFLAGS="-g" ac_add_options --target=aarch64-apple-darwin -export MACOS_SDK_DIR=$MOZ_FETCHES_DIR/MacOSX14.2.sdk +export MACOS_SDK_DIR=$MOZ_FETCHES_DIR/MacOSX14.4.sdk if [ "x$MOZ_PKG_SPECIAL" != "xasan" -a -z "$MOZ_AUTOMATION_ARTIFACT_BUILDS" ]; then # Enable static analysis checks by default on OSX cross builds. diff --git a/build/configs/macosx.mozconfig b/build/configs/macosx.mozconfig index 5afcaaa0a3..ebb07acb04 100644 --- a/build/configs/macosx.mozconfig +++ b/build/configs/macosx.mozconfig @@ -23,7 +23,7 @@ mk_add_options "export LD_LIBRARY_PATH=$MOZ_FETCHES_DIR/clang/lib" # tar -C $(dirname ${sdk_path}) -cHjf /tmp/$(basename ${sdk_path}).tar.bz2 $(basename ${sdk_path}) # Upload the resulting tarball from /tmp to tooltool, and change the entry in # `browser/config/tooltool-manifests/macosx64/cross-releng.manifest`. -CROSS_SYSROOT=$topsrcdir/MacOSX14.2.sdk +CROSS_SYSROOT=$topsrcdir/MacOSX14.4.sdk CROSS_PRIVATE_FRAMEWORKS=$CROSS_SYSROOT/System/Library/PrivateFrameworks export CC="$MOZ_FETCHES_DIR/clang/bin/clang" diff --git a/build/fetch-content b/build/fetch-content index 6e7b625dce..8dcf0960cc 100755 --- a/build/fetch-content +++ b/build/fetch-content @@ -263,8 +263,6 @@ def download_to_path(url, path, sha256=None, size=None): fh.write(chunk) return - except IntegrityError: - raise except Exception as e: log("Download failed: {}".format(e)) continue @@ -275,17 +273,15 @@ def download_to_path(url, path, sha256=None, size=None): def download_to_memory(url, sha256=None, size=None): """Download a URL to memory, possibly with verification.""" - data = b"" for _ in retrier(attempts=5, sleeptime=60): - try: - log("Downloading %s" % (url)) + data = b"" + log("Downloading %s" % (url)) + try: for chunk in stream_download(url, sha256=sha256, size=size): data += chunk return data - except IntegrityError: - raise except Exception as e: log("Download failed: {}".format(e)) continue diff --git a/ci.multibranch.Jenkinsfile b/ci.multibranch.Jenkinsfile index d92931c41a..8aac53dfea 100644 --- a/ci.multibranch.Jenkinsfile +++ b/ci.multibranch.Jenkinsfile @@ -25,7 +25,7 @@ stage('Prepare') { } download('makecab.exe') - download('MacOSX14.2.sdk.tar.xz') + download('MacOSX14.4.sdk.tar.xz') docker.build('ua-sign-windows', '-f ./build/sign-windows/Dockerfile ./build/sign-windows/ --build-arg UID=`id -u` --build-arg GID=`id -g`') @@ -668,7 +668,7 @@ def buildAndPackage(platform) { ) withMach(platform) { - sh 'rm -f `pwd`/MacOSX14.2.sdk; ln -s /builds/worker/fetches/MacOSX14.2.sdk `pwd`/MacOSX14.2.sdk' + sh 'rm -f `pwd`/MacOSX14.4.sdk; ln -s /builds/worker/fetches/MacOSX14.4.sdk `pwd`/MacOSX14.4.sdk' sh './mach build' diff --git a/ci/build-helpers.groovy b/ci/build-helpers.groovy index 26e8df9acf..6af24bc54e 100644 --- a/ci/build-helpers.groovy +++ b/ci/build-helpers.groovy @@ -9,7 +9,7 @@ def build(opts, Closure postpackage={}, Closure archiving={}) { stage('prepare') { download('makecab.exe') - download('MacOSX14.2.sdk.tar.xz') + download('MacOSX14.4.sdk.tar.xz') } def image = stage('docker build base') { @@ -37,7 +37,7 @@ def build(opts, Closure postpackage={}, Closure archiving={}) { } dir('mozilla-release') { - sh 'rm -f `pwd`/MacOSX14.2.sdk; ln -s /builds/worker/fetches/MacOSX14.2.sdk `pwd`/MacOSX14.2.sdk' + sh 'rm -f `pwd`/MacOSX14.4.sdk; ln -s /builds/worker/fetches/MacOSX14.4.sdk `pwd`/MacOSX14.4.sdk' if (opts.PGO) { stage("${opts.name}: fetch profiles") { diff --git a/fern/commands/build.js b/fern/commands/build.js index b93e3ffaf9..860483b79e 100644 --- a/fern/commands/build.js +++ b/fern/commands/build.js @@ -14,7 +14,7 @@ async function buildDocker({ docker, cwd, dockerfile, name, out }) { const stream = await docker.buildImage( { context: cwd, - src: [dockerfile, "configs", "fetch-content", "MacOSX14.2.sdk.tar.xz"], + src: [dockerfile, "configs", "fetch-content", "MacOSX14.4.sdk.tar.xz"], }, { t: name, @@ -233,20 +233,20 @@ module.exports = (program) => { }), }, { - title: "Check MacOSX14.2.sdk.tar.xz exists", + title: "Check MacOSX14.4.sdk.tar.xz exists", task: async () => { - const sdk = "MacOSX14.2.sdk.tar.xz"; + const sdk = "MacOSX14.4.sdk.tar.xz"; if ((await fileExists(path.join(buildFolder, sdk))) === false) { throw new Error(`${sdk} must be available at build/${sdk}`); } }, }, { - title: "Extract MacOSX14.2.sdk.tar.xz", - skip: () => folderExists(path.join(buildFolder, "MacOSX14.2.sdk")), + title: "Extract MacOSX14.4.sdk.tar.xz", + skip: () => folderExists(path.join(buildFolder, "MacOSX14.4.sdk")), task: async () => { await withCwd(buildFolder, () => - execa("tar", ["-xjvf", "MacOSX14.2.sdk.tar.xz"]) + execa("tar", ["-xjvf", "MacOSX14.4.sdk.tar.xz"]) ); }, }, @@ -263,8 +263,8 @@ module.exports = (program) => { Binds: [ `${path.join( buildFolder, - "MacOSX14.2.sdk" - )}:/builds/worker/workspace/MacOSX14.2.sdk`, + "MacOSX14.4.sdk" + )}:/builds/worker/workspace/MacOSX14.4.sdk`, ], }), } diff --git a/fern/commands/config.js b/fern/commands/config.js index 235fcb3c91..d3fea706db 100644 --- a/fern/commands/config.js +++ b/fern/commands/config.js @@ -25,17 +25,21 @@ module.exports = (program) => { "-l, --local", "Choose if local.mozconfig should be used" ) + .option( + "--dry", + "Dont save to disc", + ) .option( "--print", "Print mozconfig to screen" ) .action( - async ({ force, platform, brand, local, print }) => { + async ({ force, platform, brand, local, print, dry }) => { const tasks = new Listr([ { title: "Generate mozconfig", task: () => { - if (fs.existsSync(MOZCONFIG_PATH)) { + if (!dry && fs.existsSync(MOZCONFIG_PATH)) { if (!force) { throw new Error("mozconfig already exist") } @@ -68,7 +72,9 @@ module.exports = (program) => { console.log("\nfern: Generated MOZCONFIG END") } - fs.writeFileSync(MOZCONFIG_PATH, mozConfig); + if (!dry) { + fs.writeFileSync(MOZCONFIG_PATH, mozConfig); + } }, }, ]); diff --git a/fern/core/docker.js b/fern/core/docker.js index 314bf8e347..ed95ba6a81 100644 --- a/fern/core/docker.js +++ b/fern/core/docker.js @@ -130,12 +130,12 @@ async function generateDockerFile({ key, fetches, job, name, toolchains }) { ); } if (key.startsWith("macosx64")) { - statements.push("COPY MacOSX14.2.sdk.tar.xz /builds/worker/fetches/"); + statements.push("COPY MacOSX14.4.sdk.tar.xz /builds/worker/fetches/"); statements.push( [ "RUN cd /builds/worker/fetches/ &&", - "tar -xf MacOSX14.2.sdk.tar.xz &&", - "rm MacOSX14.2.sdk.tar.xz", + "tar -xf MacOSX14.4.sdk.tar.xz &&", + "rm MacOSX14.4.sdk.tar.xz", ].join(" \\\n ") ); } diff --git a/patches/.index b/patches/.index index ebe6274c1d..606bd94baa 100644 --- a/patches/.index +++ b/patches/.index @@ -37,3 +37,4 @@ 0037-Disable-help-on-switching-to-a-new-device.patch 0038-Build-remove-MacOS-entitlements.patch 0039-Remove-Firefox-View.patch +0040-Disable-experiments-reporting.patch \ No newline at end of file diff --git a/patches/0003-Update-text-in-about-dialog.patch b/patches/0003-Update-text-in-about-dialog.patch index ddaa4adff1..352cf9c580 100644 --- a/patches/0003-Update-text-in-about-dialog.patch +++ b/patches/0003-Update-text-in-about-dialog.patch @@ -7,10 +7,10 @@ Subject: Update text in about dialog 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/browser/base/content/aboutDialog.xhtml b/browser/base/content/aboutDialog.xhtml -index 2b8ebb1b75..1191cd1b67 100644 +index 55de242415..0919faa759 100644 --- a/browser/base/content/aboutDialog.xhtml +++ b/browser/base/content/aboutDialog.xhtml -@@ -123,17 +123,17 @@ +@@ -129,17 +129,17 @@ - - -@@ -142,7 +142,7 @@ +@@ -148,7 +148,7 @@ --- + +-- 2.39.2 (Apple Git-143) diff --git a/patches/0018-Ghostery-Theme.patch b/patches/0018-Ghostery-Theme.patch index be6dc45615..9b951a8350 100644 --- a/patches/0018-Ghostery-Theme.patch +++ b/patches/0018-Ghostery-Theme.patch @@ -8,11 +8,11 @@ X --- browser/themes/BuiltInThemeConfig.sys.mjs | 2 +- .../modules/LightweightThemeConsumer.sys.mjs | 2 +- - .../extensions/default-theme/experiment13.css | 294 ++++++++++++++++++ + .../extensions/default-theme/experiment13.css | 295 ++++++++++++++++++ .../extensions/default-theme/manifest.json | 57 +--- - .../extensions/internal/XPIProvider.jsm | 2 +- + .../extensions/internal/XPIProvider.sys.mjs | 2 +- toolkit/mozapps/extensions/jar.mn | 1 + - 6 files changed, 314 insertions(+), 44 deletions(-) + 6 files changed, 315 insertions(+), 44 deletions(-) create mode 100644 toolkit/mozapps/extensions/default-theme/experiment13.css diff --git a/browser/themes/BuiltInThemeConfig.sys.mjs b/browser/themes/BuiltInThemeConfig.sys.mjs @@ -29,24 +29,24 @@ index 7cfea4b705..428b24635a 100644 "firefox-compact-light@mozilla.org", { diff --git a/toolkit/modules/LightweightThemeConsumer.sys.mjs b/toolkit/modules/LightweightThemeConsumer.sys.mjs -index cf388eb3d3..fd0e793aa4 100644 +index c2ad888c22..9158afa112 100644 --- a/toolkit/modules/LightweightThemeConsumer.sys.mjs +++ b/toolkit/modules/LightweightThemeConsumer.sys.mjs @@ -23,7 +23,7 @@ XPCOMUtils.defineLazyPreferenceGetter( false ); - + -const DEFAULT_THEME_ID = "default-theme@mozilla.org"; +const DEFAULT_THEME_ID = "__DOES_NOT_APPLY__"; // in Ghostery Browser default theme is a lightweight theme - + const toolkitVariableMap = [ [ diff --git a/toolkit/mozapps/extensions/default-theme/experiment13.css b/toolkit/mozapps/extensions/default-theme/experiment13.css new file mode 100644 -index 0000000000..f86e5ce147 +index 0000000000..03bbfd171b --- /dev/null +++ b/toolkit/mozapps/extensions/default-theme/experiment13.css -@@ -0,0 +1,294 @@ +@@ -0,0 +1,295 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ @@ -196,6 +196,7 @@ index 0000000000..f86e5ce147 +} + +#nav-bar { ++ border-top: 0px !important; + border-bottom: 0.5px solid rgba(0, 0, 0, 0.15) !important; +} + @@ -348,7 +349,7 @@ index f89a4236ff..6c71ff4490 100644 @@ -7,34 +7,32 @@ } }, - + - "name": "System theme — auto", - "description": "Follow the operating system setting for buttons, menus, and windows.", - "author": "Mozilla", @@ -357,9 +358,9 @@ index f89a4236ff..6c71ff4490 100644 + "description": "", + "author": "Ghostery", + "version": "1.13", - + "icons": { "32": "icon.svg" }, - + - "theme": {}, - - "dark_theme": { @@ -405,7 +406,7 @@ index f89a4236ff..6c71ff4490 100644 "properties": { @@ -67,29 +65,6 @@ }, - + "theme_experiment": { - "colors": { - "button": "--button-bgcolor", @@ -435,10 +436,10 @@ index f89a4236ff..6c71ff4490 100644 } } diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.sys.mjs b/toolkit/mozapps/extensions/internal/XPIProvider.sys.mjs -index 94e5e26636..c7772b0e67 100644 +index 3c090b5f0f..41c98da471 100644 --- a/toolkit/mozapps/extensions/internal/XPIProvider.sys.mjs +++ b/toolkit/mozapps/extensions/internal/XPIProvider.sys.mjs -@@ -2553,7 +2553,7 @@ var XPIProvider = { +@@ -2547,7 +2547,7 @@ export var XPIProvider = { } this.maybeInstallBuiltinAddon( "default-theme@mozilla.org", @@ -446,7 +447,7 @@ index 94e5e26636..c7772b0e67 100644 + "1.13", "resource://default-theme/" ); - + diff --git a/toolkit/mozapps/extensions/jar.mn b/toolkit/mozapps/extensions/jar.mn index a881ed3843..d98404543a 100644 --- a/toolkit/mozapps/extensions/jar.mn @@ -457,6 +458,6 @@ index a881ed3843..d98404543a 100644 content/mozapps/extensions/default-theme/manifest.json (default-theme/manifest.json) + content/mozapps/extensions/default-theme/experiment13.css (default-theme/experiment13.css) #endif --- +-- 2.39.3 (Apple Git-145) diff --git a/patches/0040-Disable-experiments-reporting.patch b/patches/0040-Disable-experiments-reporting.patch new file mode 100644 index 0000000000..76b3b210f4 --- /dev/null +++ b/patches/0040-Disable-experiments-reporting.patch @@ -0,0 +1,73 @@ +From: Krzysztof Modras +Date: Thu, 23 May 2024 16:29:55 +0200 +Subject: Disable experiments reporting + +--- + .../nimbus/lib/ExperimentManager.sys.mjs | 51 ------------------- + 1 file changed, 51 deletions(-) + +diff --git a/toolkit/components/nimbus/lib/ExperimentManager.sys.mjs b/toolkit/components/nimbus/lib/ExperimentManager.sys.mjs +index 8bd847b067..2f3b3a92de 100644 +--- a/toolkit/components/nimbus/lib/ExperimentManager.sys.mjs ++++ b/toolkit/components/nimbus/lib/ExperimentManager.sys.mjs +@@ -120,57 +120,6 @@ export class _ExperimentManager { + return new Date(); + }, + }; +- Object.defineProperty(context, "activeExperiments", { +- enumerable: true, +- get: async () => { +- await this.store.ready(); +- return this.store.getAllActiveExperiments().map(exp => exp.slug); +- }, +- }); +- Object.defineProperty(context, "activeRollouts", { +- enumerable: true, +- get: async () => { +- await this.store.ready(); +- return this.store.getAllActiveRollouts().map(rollout => rollout.slug); +- }, +- }); +- Object.defineProperty(context, "previousExperiments", { +- enumerable: true, +- get: async () => { +- await this.store.ready(); +- return this.store +- .getAll() +- .filter(enrollment => !enrollment.active && !enrollment.isRollout) +- .map(exp => exp.slug); +- }, +- }); +- Object.defineProperty(context, "previousRollouts", { +- enumerable: true, +- get: async () => { +- await this.store.ready(); +- return this.store +- .getAll() +- .filter(enrollment => !enrollment.active && enrollment.isRollout) +- .map(rollout => rollout.slug); +- }, +- }); +- Object.defineProperty(context, "enrollments", { +- enumerable: true, +- get: async () => { +- await this.store.ready(); +- return this.store.getAll().map(enrollment => enrollment.slug); +- }, +- }); +- Object.defineProperty(context, "enrollmentsMap", { +- enumerable: true, +- get: async () => { +- await this.store.ready(); +- return this.store.getAll().reduce((acc, enrollment) => { +- acc[enrollment.slug] = enrollment.branch.slug; +- return acc; +- }, {}); +- }, +- }); + return context; + } + +-- +2.39.3 (Apple Git-145) +