From def92d1b8e9d373e2f6f27c366d578d97d8960c6 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 15 May 2024 05:34:50 +0200 Subject: Merging upstream version 126.0. Signed-off-by: Daniel Baumann --- taskcluster/ci/toolchain/android.yml | 20 +++++++++++ taskcluster/ci/toolchain/dump-syms.yml | 8 ++--- taskcluster/ci/toolchain/hostutils.yml | 23 +++++++++++++ taskcluster/ci/toolchain/kind.yml | 1 + taskcluster/ci/toolchain/llvm-symbolizer.yml | 30 ++++++++++++++++ taskcluster/ci/toolchain/macos-sdk.yml | 16 ++++----- taskcluster/ci/toolchain/misc.yml | 51 ++++++++++++++-------------- taskcluster/ci/toolchain/rust.yml | 42 +++++++++++------------ 8 files changed, 133 insertions(+), 58 deletions(-) create mode 100644 taskcluster/ci/toolchain/hostutils.yml (limited to 'taskcluster/ci/toolchain') diff --git a/taskcluster/ci/toolchain/android.yml b/taskcluster/ci/toolchain/android.yml index 3c76f7cad4..6c2c558c9c 100644 --- a/taskcluster/ci/toolchain/android.yml +++ b/taskcluster/ci/toolchain/android.yml @@ -190,6 +190,8 @@ linux64-android-gradle-dependencies: worker: env: GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-online" + ANDROID_SDK_ROOT: "/builds/worker/fetches/android-sdk-linux" + max-run-time: 2700 run: script: android-gradle-dependencies.sh sparse-profile: null @@ -200,6 +202,10 @@ linux64-android-gradle-dependencies: - 'mobile/android/config/mozconfigs/android-arm-gradle-dependencies/**' - 'mobile/android/config/mozconfigs/common*' - 'mobile/android/gradle.configure' + - 'mobile/android/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt' + - 'mobile/android/android-components/plugins/dependencies/src/main/java/ApplicationServices.kt' + - 'mobile/android/fenix/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt' + - 'mobile/android/focus-android/plugins/focusdependencies/src/main/java/FocusDependenciesPlugin.kt' toolchain-artifact: public/build/android-gradle-dependencies.tar.zst toolchain-alias: android-gradle-dependencies fetches: @@ -212,6 +218,7 @@ linux64-android-gradle-dependencies: - linux64-android-sdk-linux-repack - linux64-jdk-repack - linux64-node + - android-gradle-python-envs linux64-android-gradle-dependencies-lite: description: "Android Lite Gradle dependencies toolchain task" @@ -230,6 +237,8 @@ linux64-android-gradle-dependencies-lite: - 'mobile/android/config/mozconfigs/android-arm-gradle-dependencies/**' - 'mobile/android/config/mozconfigs/common*' - 'mobile/android/gradle.configure' + - 'mobile/android/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt' + - 'mobile/android/android-components/plugins/dependencies/src/main/java/ApplicationServices.kt' toolchain-artifact: public/build/android-gradle-dependencies.tar.zst toolchain-alias: android-gradle-dependencies-lite fetches: @@ -242,3 +251,14 @@ linux64-android-gradle-dependencies-lite: - linux64-android-sdk-linux-repack - linux64-jdk-repack - linux64-node + - android-gradle-python-envs + +android-gradle-python-envs: + description: "gradle-python-envs plugin toolchain task" + treeherder: + symbol: TL(gradle-python-envs) + run: + script: gradle-python-envs.sh + arguments: ['0.0.31'] + sparse-profile: null + toolchain-artifact: public/build/gradle-python-envs-0.0.31.tar.zst diff --git a/taskcluster/ci/toolchain/dump-syms.yml b/taskcluster/ci/toolchain/dump-syms.yml index 95e90b5984..05aee5e352 100644 --- a/taskcluster/ci/toolchain/dump-syms.yml +++ b/taskcluster/ci/toolchain/dump-syms.yml @@ -24,7 +24,7 @@ linux64-dump_syms: fetches: toolchain: - linux64-clang-toolchain - - linux64-rust-toolchain + - linux64-rust - sysroot-x86_64-linux-gnu macosx64-dump_syms: @@ -35,7 +35,7 @@ macosx64-dump_syms: arguments: ['x86_64-apple-darwin'] fetches: toolchain: - - linux64-rust-macos-toolchain + - linux64-rust-macos - linux64-clang-toolchain - macosx64-sdk-toolchain @@ -46,7 +46,7 @@ macosx64-aarch64-dump_syms: arguments: ['aarch64-apple-darwin'] fetches: toolchain: - - linux64-rust-macos-toolchain + - linux64-rust-macos - linux64-clang-toolchain - macosx64-sdk-toolchain @@ -58,5 +58,5 @@ win64-dump_syms: fetches: toolchain: - linux64-clang-toolchain - - linux64-rust-windows-toolchain + - linux64-rust-windows - vs-toolchain diff --git a/taskcluster/ci/toolchain/hostutils.yml b/taskcluster/ci/toolchain/hostutils.yml new file mode 100644 index 0000000000..d9974e917a --- /dev/null +++ b/taskcluster/ci/toolchain/hostutils.yml @@ -0,0 +1,23 @@ +# 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/. +--- +job-defaults: + description: "hostutils toolchain build" + worker-type: b-linux-gcp + worker: + max-run-time: 1800 + run: + using: toolchain-script + script: get-hostutils.sh + toolchain-artifact: public/build/hostutils.tar.zst + +linux64-hostutils: + treeherder: + symbol: TL(hostutils) + worker: + env: + TOOLTOOL_MANIFEST: testing/config/tooltool-manifests/linux64/hostutils.manifest + run: + resources: + - testing/config/tooltool-manifests/linux64/hostutils.manifest diff --git a/taskcluster/ci/toolchain/kind.yml b/taskcluster/ci/toolchain/kind.yml index d9dd52c980..524bb20670 100644 --- a/taskcluster/ci/toolchain/kind.yml +++ b/taskcluster/ci/toolchain/kind.yml @@ -36,6 +36,7 @@ jobs-from: - geckodriver.yml - gn.yml - grcov.yml + - hostutils.yml - libunwind.yml - llvm-symbolizer.yml - macos-sdk.yml diff --git a/taskcluster/ci/toolchain/llvm-symbolizer.yml b/taskcluster/ci/toolchain/llvm-symbolizer.yml index 8864a81cc1..11b63397c2 100644 --- a/taskcluster/ci/toolchain/llvm-symbolizer.yml +++ b/taskcluster/ci/toolchain/llvm-symbolizer.yml @@ -18,8 +18,10 @@ linux32-llvm-symbolizer-17: arguments: - i686-unknown-linux-gnu - build/build-clang/clang-17.json + - build/build-clang/llvm-symbolizer-17.json resources: - build/build-clang/clang-17.json + - build/build-clang/llvm-symbolizer-17.json - taskcluster/scripts/misc/build-llvm-common.sh toolchain-alias: by-project: @@ -40,8 +42,10 @@ linux64-llvm-symbolizer-17: arguments: - x86_64-unknown-linux-gnu - build/build-clang/clang-17.json + - build/build-clang/llvm-symbolizer-17.json resources: - build/build-clang/clang-17.json + - build/build-clang/llvm-symbolizer-17.json - taskcluster/scripts/misc/build-llvm-common.sh toolchain-alias: by-project: @@ -62,8 +66,10 @@ macosx64-llvm-symbolizer-17: arguments: - x86_64-apple-darwin - build/build-clang/clang-17.json + - build/build-clang/llvm-symbolizer-17.json resources: - build/build-clang/clang-17.json + - build/build-clang/llvm-symbolizer-17.json - taskcluster/scripts/misc/build-llvm-common.sh toolchain-alias: by-project: @@ -84,8 +90,10 @@ macosx64-aarch64-llvm-symbolizer-17: arguments: - aarch64-apple-darwin - build/build-clang/clang-17.json + - build/build-clang/llvm-symbolizer-17.json resources: - build/build-clang/clang-17.json + - build/build-clang/llvm-symbolizer-17.json - taskcluster/scripts/misc/build-llvm-common.sh toolchain-alias: by-project: @@ -106,8 +114,10 @@ win64-llvm-symbolizer-17: arguments: - x86_64-pc-windows-msvc - build/build-clang/clang-17.json + - build/build-clang/llvm-symbolizer-17.json resources: - build/build-clang/clang-17.json + - build/build-clang/llvm-symbolizer-17.json - taskcluster/scripts/misc/build-llvm-common.sh toolchain-alias: by-project: @@ -128,8 +138,10 @@ linux32-llvm-symbolizer-18: arguments: - i686-unknown-linux-gnu - build/build-clang/clang-18.json + - build/build-clang/llvm-symbolizer-18.json resources: - build/build-clang/clang-18.json + - build/build-clang/llvm-symbolizer-18.json - taskcluster/scripts/misc/build-llvm-common.sh fetches: fetch: @@ -146,8 +158,10 @@ linux64-llvm-symbolizer-18: arguments: - x86_64-unknown-linux-gnu - build/build-clang/clang-18.json + - build/build-clang/llvm-symbolizer-18.json resources: - build/build-clang/clang-18.json + - build/build-clang/llvm-symbolizer-18.json - taskcluster/scripts/misc/build-llvm-common.sh fetches: fetch: @@ -164,8 +178,10 @@ macosx64-llvm-symbolizer-18: arguments: - x86_64-apple-darwin - build/build-clang/clang-18.json + - build/build-clang/llvm-symbolizer-18.json resources: - build/build-clang/clang-18.json + - build/build-clang/llvm-symbolizer-18.json - taskcluster/scripts/misc/build-llvm-common.sh fetches: fetch: @@ -182,8 +198,10 @@ macosx64-aarch64-llvm-symbolizer-18: arguments: - aarch64-apple-darwin - build/build-clang/clang-18.json + - build/build-clang/llvm-symbolizer-18.json resources: - build/build-clang/clang-18.json + - build/build-clang/llvm-symbolizer-18.json - taskcluster/scripts/misc/build-llvm-common.sh fetches: fetch: @@ -200,8 +218,10 @@ win64-llvm-symbolizer-18: arguments: - x86_64-pc-windows-msvc - build/build-clang/clang-18.json + - build/build-clang/llvm-symbolizer-18.json resources: - build/build-clang/clang-18.json + - build/build-clang/llvm-symbolizer-18.json - taskcluster/scripts/misc/build-llvm-common.sh fetches: fetch: @@ -220,8 +240,10 @@ linux32-llvm-symbolizer-trunk: arguments: - i686-unknown-linux-gnu - build/build-clang/clang-trunk.json + - build/build-clang/llvm-symbolizer-trunk.json resources: - build/build-clang/clang-trunk.json + - build/build-clang/llvm-symbolizer-trunk.json - taskcluster/scripts/misc/build-llvm-common.sh toolchain-alias: by-project: @@ -244,8 +266,10 @@ linux64-llvm-symbolizer-trunk: arguments: - x86_64-unknown-linux-gnu - build/build-clang/clang-trunk.json + - build/build-clang/llvm-symbolizer-trunk.json resources: - build/build-clang/clang-trunk.json + - build/build-clang/llvm-symbolizer-trunk.json - taskcluster/scripts/misc/build-llvm-common.sh toolchain-alias: by-project: @@ -268,8 +292,10 @@ macosx64-llvm-symbolizer-trunk: arguments: - x86_64-apple-darwin - build/build-clang/clang-trunk.json + - build/build-clang/llvm-symbolizer-trunk.json resources: - build/build-clang/clang-trunk.json + - build/build-clang/llvm-symbolizer-trunk.json - taskcluster/scripts/misc/build-llvm-common.sh toolchain-alias: by-project: @@ -292,8 +318,10 @@ macosx64-aarch64-llvm-symbolizer-trunk: arguments: - aarch64-apple-darwin - build/build-clang/clang-trunk.json + - build/build-clang/llvm-symbolizer-trunk.json resources: - build/build-clang/clang-trunk.json + - build/build-clang/llvm-symbolizer-trunk.json - taskcluster/scripts/misc/build-llvm-common.sh toolchain-alias: by-project: @@ -316,8 +344,10 @@ win64-llvm-symbolizer-trunk: arguments: - x86_64-pc-windows-msvc - build/build-clang/clang-trunk.json + - build/build-clang/llvm-symbolizer-trunk.json resources: - build/build-clang/clang-trunk.json + - build/build-clang/llvm-symbolizer-trunk.json - taskcluster/scripts/misc/build-llvm-common.sh toolchain-alias: by-project: diff --git a/taskcluster/ci/toolchain/macos-sdk.yml b/taskcluster/ci/toolchain/macos-sdk.yml index 60e4c231fd..194a1ee20a 100644 --- a/taskcluster/ci/toolchain/macos-sdk.yml +++ b/taskcluster/ci/toolchain/macos-sdk.yml @@ -32,20 +32,20 @@ macosx64-sdk-13.3: toolchain-alias: - MacOSX13.3.sdk -macosx64-sdk-14.2: - description: "MacOSX14.2 SDK" +macosx64-sdk-14.4: + description: "MacOSX14.4 SDK" treeherder: - symbol: TM(sdk14.2) + symbol: TM(sdk14.4) run: arguments: - - https://swcdn.apple.com/content/downloads/35/47/042-23550-A_M34N50O9N3/sua6ev7bjcexvorh4709vsgk64zgvsl42p/CLTools_macOSNMOS_SDK.pkg - - 22ce0acc9ab5c28845218b8c686d0208d6bf66bef64a369d3c0622247ba1258b438c9e44c64bb2bacf5e99eb398a6e7a337f2730cd4a969a7f0d2d5d3107306a - - Library/Developer/CommandLineTools/SDKs/MacOSX14.2.sdk - toolchain-artifact: project/gecko/mac-sdk/MacOSX14.2.sdk.tar.zst + - https://swcdn.apple.com/content/downloads/14/48/052-59890-A_I0F5YGAY0Y/p9n40hio7892gou31o1v031ng6fnm9sb3c/CLTools_macOSNMOS_SDK.pkg + - a4e05d2a051027620c86f72694da126a2ceed59b8740270426c4ca3adb38e16fe981b536a373a7f0cdcc84bbe9d9149608ccd03967dbd94262548ccadbfa0f5d + - Library/Developer/CommandLineTools/SDKs/MacOSX14.4.sdk + toolchain-artifact: project/gecko/mac-sdk/MacOSX14.4.sdk.tar.zst toolchain-alias: - macosx64-sdk - macosx64-sdk-toolchain - - MacOSX14.2.sdk + - MacOSX14.4.sdk ios-sdk-17.4: description: "iPhoneOS17.4 SDK" diff --git a/taskcluster/ci/toolchain/misc.yml b/taskcluster/ci/toolchain/misc.yml index 4424cf6e0b..80356f5be6 100644 --- a/taskcluster/ci/toolchain/misc.yml +++ b/taskcluster/ci/toolchain/misc.yml @@ -206,8 +206,8 @@ macosx64-custom-car: treeherder: symbol: TM(custom-car) worker: - max-run-time: 35000 - use-system-python: false + max-run-time: 40000 + use-python: default run-on-projects: [] run: script: build-custom-car.sh @@ -231,7 +231,7 @@ macosx64-custom-car: toolchain-artifact: public/build/car_macosx.tar.zst fetches: toolchain: - - macosx64-sdk-14.2 + - macosx64-sdk-14.4 macosx-arm64-custom-car: description: "Custom chromium-as-release build for mac (apple silicon)" @@ -243,7 +243,7 @@ macosx-arm64-custom-car: tier: 2 worker: max-run-time: 50000 - use-system-python: false + use-python: default run-on-projects: [] run: script: build-custom-car.sh @@ -267,7 +267,7 @@ macosx-arm64-custom-car: toolchain-artifact: public/build/car_macosx_arm.tar.zst fetches: toolchain: - - macosx64-sdk-14.2 + - macosx64-sdk-14.4 android-custom-car: description: "Custom chromium-as-release build for Android" @@ -278,7 +278,7 @@ android-custom-car: worker: docker-image: {in-tree: custom-car-android} max-run-time: 20000 - use-system-python: false + use-python: default run-on-projects: [] run: script: build-custom-car.sh @@ -313,7 +313,7 @@ linux64-custom-car: worker: docker-image: {in-tree: custom-car-linux} max-run-time: 16200 - use-system-python: false + use-python: default run-on-projects: [] run: script: build-custom-car.sh @@ -347,7 +347,7 @@ win64-custom-car: max-run-time: 16200 env: MSYSTEM: "MINGW64" - use-system-python: false + use-python: default run-on-projects: [] run: script: build-custom-car.sh @@ -508,23 +508,6 @@ nsis: - linux64-clang-toolchain - sysroot-x86_64-linux-gnu -win64-vs2019: - description: "VS 2019" - attributes: - local-toolchain: true - treeherder: - symbol: TW64(msvc2019) - worker: - env: - MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE: system - run: - script: get_vs.py - arguments: - - build/vs/vs2019.yaml - resources: - - build/vs/vs2019.yaml - toolchain-artifact: project/gecko/vs/vs.tar.zst - win64-vs2022: description: "VS 2022" attributes: @@ -617,3 +600,21 @@ win64-libxml2: toolchain: - linux64-clang-toolchain - vs-toolchain + +talos-pdfs: + description: "Gathers all the PDFs needed for the pdfpaint test" + attributes: + local-toolchain: true + treeherder: + symbol: TL(talos-pdfs) + worker: + max-run-time: 3600 + run: + script: run-fetch-talos-pdfs.sh + sparse-profile: null + resources: + - 'taskcluster/scripts/misc/fetch-talos-pdfs.py' + toolchain-artifact: public/build/talos-pdfs.tar.zst + fetches: + fetch: + - mozilla-pdf.js diff --git a/taskcluster/ci/toolchain/rust.yml b/taskcluster/ci/toolchain/rust.yml index 62f4fd4747..437c497d71 100644 --- a/taskcluster/ci/toolchain/rust.yml +++ b/taskcluster/ci/toolchain/rust.yml @@ -26,12 +26,12 @@ linux64-rust-1.74: - linux64-rust-base - linux64-rust-toolchain -linux64-rust-1.76: +linux64-rust-1.77: treeherder: symbol: TL(rust) run: arguments: [ - '--channel', '1.76.0', + '--channel', '1.77.2', '--host', 'x86_64-unknown-linux-gnu', '--target', 'x86_64-unknown-linux-gnu', '--target', 'i686-unknown-linux-gnu', @@ -62,18 +62,18 @@ linux64-rust-dev: ] fetches: fetch: - - rust-1.76.0 + - rust-1.77.2 toolchain: - linux64-clang-toolchain - linux64-toolchain-sysroot -linux64-rust-cross-1.76: +linux64-rust-cross-1.77: description: "rust repack with macos and windows cross support" treeherder: symbol: TL(rust-cross) run: arguments: [ - '--channel', '1.76.0', + '--channel', '1.77.2', '--host', 'x86_64-unknown-linux-gnu', '--target', 'x86_64-unknown-linux-gnu', '--target', 'i686-unknown-linux-gnu', @@ -90,13 +90,13 @@ linux64-rust-cross-1.76: ] toolchain-alias: linux64-rust-cross -linux64-rust-static-1.76: +linux64-rust-static-1.77: description: "rust repack with static linking support" treeherder: symbol: TL(rust-static) run: arguments: [ - '--channel', '1.76.0', + '--channel', '1.77.2', '--host', 'x86_64-unknown-linux-gnu', '--target', 'aarch64-unknown-linux-musl', '--target', 'x86_64-unknown-linux-gnu', @@ -120,13 +120,13 @@ linux64-rust-macos-1.70: ] toolchain-alias: linux64-rust-macos-toolchain -linux64-rust-macos-1.76: +linux64-rust-macos-1.77: description: "rust repack with macos-cross support" treeherder: symbol: TL(rust-macos) run: arguments: [ - '--channel', '1.76.0', + '--channel', '1.77.2', '--host', 'x86_64-unknown-linux-gnu', '--target', 'x86_64-unknown-linux-gnu', '--target', 'x86_64-apple-darwin', @@ -134,13 +134,13 @@ linux64-rust-macos-1.76: ] toolchain-alias: linux64-rust-macos -linux64-rust-ios-1.76: +linux64-rust-ios-1.77: description: "rust repack with ios-cross support" treeherder: symbol: TL(rust-ios) run: arguments: [ - '--channel', '1.76.0', + '--channel', '1.77.2', '--host', 'x86_64-unknown-linux-gnu', '--target', 'x86_64-unknown-linux-gnu', '--target', 'aarch64-apple-ios', @@ -148,13 +148,13 @@ linux64-rust-ios-1.76: ] toolchain-alias: linux64-rust-ios -linux64-rust-android-1.76: +linux64-rust-android-1.77: description: "rust repack with android-cross support" treeherder: symbol: TL(rust-android) run: arguments: [ - '--channel', '1.76.0', + '--channel', '1.77.2', '--host', 'x86_64-unknown-linux-gnu', '--target', 'x86_64-unknown-linux-gnu', '--target', 'armv7-linux-androideabi', @@ -179,13 +179,13 @@ linux64-rust-windows-1.70: ] toolchain-alias: linux64-rust-windows-toolchain -linux64-rust-windows-1.76: +linux64-rust-windows-1.77: description: "rust repack with windows-cross support" treeherder: symbol: TL(rust-win) run: arguments: [ - '--channel', '1.76.0', + '--channel', '1.77.2', '--host', 'x86_64-unknown-linux-gnu', '--target', 'x86_64-unknown-linux-gnu', '--target', 'x86_64-pc-windows-msvc', @@ -194,12 +194,12 @@ linux64-rust-windows-1.76: ] toolchain-alias: linux64-rust-windows -win64-rust-1.76: +win64-rust-1.77: treeherder: symbol: TW64(rust) run: arguments: [ - '--channel', '1.76.0', + '--channel', '1.77.2', '--host', 'x86_64-pc-windows-msvc', '--target', 'x86_64-pc-windows-msvc', '--target', 'i686-pc-windows-msvc', @@ -207,23 +207,23 @@ win64-rust-1.76: ] toolchain-alias: win64-rust -macosx64-rust-1.76: +macosx64-rust-1.77: treeherder: symbol: TM(rust) run: arguments: [ - '--channel', '1.76.0', + '--channel', '1.77.2', '--host', 'x86_64-apple-darwin', '--target', 'x86_64-apple-darwin', ] toolchain-alias: macosx64-rust -mingw32-rust-1.76: +mingw32-rust-1.77: treeherder: symbol: TMW(rust) run: arguments: [ - '--channel', '1.76.0', + '--channel', '1.77.2', '--host', 'x86_64-unknown-linux-gnu', '--target', 'i686-unknown-linux-gnu', '--target', 'i686-pc-windows-gnu', -- cgit v1.2.3