From 2dca037b2749c0dc9bd8248ad154d1efdf9c4d24 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Tue, 21 Nov 2023 01:08:15 +0000 Subject: [PATCH] Bug 1857089 - Update builders to rustc 1.74. r=firefox-build-system-reviewers,ahochheiden Differential Revision: https://phabricator.services.mozilla.com/D194166 --- docs/writing-rust-code/update-policy.md | 2 +- mozglue/static/rust/build.rs | 4 +- taskcluster/ci/fetch/toolchains.yml | 6 +- taskcluster/ci/searchfox/kind.yml | 8 +-- taskcluster/ci/toolchain/rust.yml | 73 +++++++------------------ 5 files changed, 29 insertions(+), 64 deletions(-) diff --git a/docs/writing-rust-code/update-policy.md b/docs/writing-rust-code/update-policy.md index 398f7844f5ef..f3c1ac381e6a 100644 --- a/docs/writing-rust-code/update-policy.md +++ b/docs/writing-rust-code/update-policy.md @@ -147,8 +147,8 @@ Here are the Rust versions for each Firefox version. | Firefox 118 | Rust 1.71.0 | 1.66.0 | 2023 July 13 | 2023 August 24 | 2023 September 26 | Firefox 119 | Rust 1.72.0 | 1.66.0 | 2023 August 24 | 2023 September 21 | 2023 October 24 | Firefox 120 | Rust 1.72.0 | 1.70.0 | 2023 October 4 | 2023 October 19 | 2023 November 21 +| Firefox 121 | Rust 1.73.0 | 1.70.0 | 2023 October 4 | 2023 November 16 | 2023 December 19 | **Estimated** | -| Firefox 121 | Rust 1.73.0 | ? | 2023 October 4 | 2023 November 16 | 2023 December 19 | Firefox 122 | Rust 1.74.0 | ? | 2023 November 16 | 2023 December 14 | 2024 January 23 | Firefox 123 | Rust 1.75.0 | ? | 2023 December 28 | 2024 January 11 | 2024 February 20 | Firefox 124 | Rust 1.76.0 | ? | 2023 February 8 | 2024 February 15 | 2024 March 19 diff --git a/mozglue/static/rust/build.rs b/mozglue/static/rust/build.rs index cc7ca4d80e0c..f11a152f0065 100644 --- a/mozglue/static/rust/build.rs +++ b/mozglue/static/rust/build.rs @@ -16,10 +16,10 @@ fn main() { println!("cargo:rerun-if-changed=wrappers.cpp"); let ver = version().unwrap(); - let max_oom_hook_version = Version::parse("1.74.0-alpha").unwrap(); + let max_oom_hook_version = Version::parse("1.75.0-alpha").unwrap(); // The new alloc error panic feature was temporarily reverted. We kept the // code in tree, but the version here is such that it's effectively never used. - let max_alloc_error_panic_version = Version::parse("1.74.0-alpha").unwrap(); + let max_alloc_error_panic_version = Version::parse("1.75.0-alpha").unwrap(); if ver < max_oom_hook_version { println!("cargo:rustc-cfg=feature=\"oom_with_hook\""); diff --git a/taskcluster/ci/fetch/toolchains.yml b/taskcluster/ci/fetch/toolchains.yml index 3f57f27f8a09..89346a17919c 100644 --- a/taskcluster/ci/fetch/toolchains.yml +++ b/taskcluster/ci/fetch/toolchains.yml @@ -370,13 +370,13 @@ clang-trunk: # We build stable rust from source so the resulting compiler acts as a nightly # rust compiler, allowing to use unstable features like -Zbuild-std and # sanitizers. -rust-1.73.0: - description: Rust 1.73.0 source code +rust-1.74.0: + description: Rust 1.74.0 source code fetch: type: git include-dot-git: true repo: https://github.com/rust-lang/rust/ - revision: cc66ad468955717ab92600c770da8c1601a4ff33 + revision: 79e9716c980570bfd1f666e3b16ac583f0168962 wasi-sdk-11: description: wasi-sdk-11 source code diff --git a/taskcluster/ci/searchfox/kind.yml b/taskcluster/ci/searchfox/kind.yml index a183e275f757..7911b703f1a9 100644 --- a/taskcluster/ci/searchfox/kind.yml +++ b/taskcluster/ci/searchfox/kind.yml @@ -56,7 +56,7 @@ jobs: - linux64-clang - linux64-nasm - linux64-node - - linux64-rust-1.72 + - linux64-rust - linux64-cbindgen - linux64-dump_syms - linux64-pkgconf @@ -92,7 +92,7 @@ jobs: - linux64-libdmg - linux64-nasm - linux64-node - - linux64-rust-cross-1.72 + - linux64-rust-cross - linux64-cbindgen - linux64-dump_syms - macosx64-sdk @@ -126,7 +126,7 @@ jobs: fetches: toolchain: - linux64-clang - - linux64-rust-cross-1.72 + - linux64-rust-cross - linux64-rust-size - linux64-nasm - linux64-node @@ -172,7 +172,7 @@ jobs: - android-sdk-linux - linux64-jdk - linux64-clang - - linux64-rust-cross-1.72 + - linux64-rust-cross - linux64-rust-size - linux64-cbindgen - linux64-dump_syms diff --git a/taskcluster/ci/toolchain/rust.yml b/taskcluster/ci/toolchain/rust.yml index 4f0a99907ff7..ef837c143310 100644 --- a/taskcluster/ci/toolchain/rust.yml +++ b/taskcluster/ci/toolchain/rust.yml @@ -26,25 +26,12 @@ linux64-rust-1.70: - linux64-rust-base - linux64-rust-toolchain -linux64-rust-1.72: - treeherder: - symbol: TL(rust-1.72) - run: - arguments: [ - '--channel', '1.72.0', - '--host', 'x86_64-unknown-linux-gnu', - '--target', 'x86_64-unknown-linux-gnu', - '--target', 'i686-unknown-linux-gnu', - '--target', 'aarch64-unknown-linux-gnu', - '--target', 'wasm32-wasi', - ] - -linux64-rust-1.73: +linux64-rust-1.74: treeherder: symbol: TL(rust) run: arguments: [ - '--channel', '1.73.0', + '--channel', '1.74.0', '--host', 'x86_64-unknown-linux-gnu', '--target', 'x86_64-unknown-linux-gnu', '--target', 'i686-unknown-linux-gnu', @@ -75,39 +62,17 @@ linux64-rust-dev: ] fetches: fetch: - - rust-1.73.0 + - rust-1.74.0 toolchain: - linux64-clang-toolchain -linux64-rust-cross-1.72: - description: "rust repack with macos and windows cross support" - treeherder: - symbol: TL(rust-cross-1.72) - run: - arguments: [ - '--channel', '1.72.0', - '--host', 'x86_64-unknown-linux-gnu', - '--target', 'x86_64-unknown-linux-gnu', - '--target', 'i686-unknown-linux-gnu', - '--target', 'x86_64-apple-darwin', - '--target', 'aarch64-apple-darwin', - '--target', 'x86_64-pc-windows-msvc', - '--target', 'i686-pc-windows-msvc', - '--target', 'aarch64-pc-windows-msvc', - '--target', 'armv7-linux-androideabi', - '--target', 'thumbv7neon-linux-androideabi', - '--target', 'aarch64-linux-android', - '--target', 'i686-linux-android', - '--target', 'x86_64-linux-android', - ] - -linux64-rust-cross-1.73: +linux64-rust-cross-1.74: description: "rust repack with macos and windows cross support" treeherder: symbol: TL(rust-cross) run: arguments: [ - '--channel', '1.73.0', + '--channel', '1.74.0', '--host', 'x86_64-unknown-linux-gnu', '--target', 'x86_64-unknown-linux-gnu', '--target', 'i686-unknown-linux-gnu', @@ -124,13 +89,13 @@ linux64-rust-cross-1.73: ] toolchain-alias: linux64-rust-cross -linux64-rust-static-1.73: +linux64-rust-static-1.74: description: "rust repack with static linking support" treeherder: symbol: TL(rust-static) run: arguments: [ - '--channel', '1.73.0', + '--channel', '1.74.0', '--host', 'x86_64-unknown-linux-gnu', '--target', 'aarch64-unknown-linux-musl', '--target', 'x86_64-unknown-linux-gnu', @@ -154,13 +119,13 @@ linux64-rust-macos-1.70: ] toolchain-alias: linux64-rust-macos-toolchain -linux64-rust-macos-1.73: +linux64-rust-macos-1.74: description: "rust repack with macos-cross support" treeherder: symbol: TL(rust-macos) run: arguments: [ - '--channel', '1.73.0', + '--channel', '1.74.0', '--host', 'x86_64-unknown-linux-gnu', '--target', 'x86_64-unknown-linux-gnu', '--target', 'x86_64-apple-darwin', @@ -168,13 +133,13 @@ linux64-rust-macos-1.73: ] toolchain-alias: linux64-rust-macos -linux64-rust-android-1.73: +linux64-rust-android-1.74: description: "rust repack with android-cross support" treeherder: symbol: TL(rust-android) run: arguments: [ - '--channel', '1.73.0', + '--channel', '1.74.0', '--host', 'x86_64-unknown-linux-gnu', '--target', 'x86_64-unknown-linux-gnu', '--target', 'armv7-linux-androideabi', @@ -199,13 +164,13 @@ linux64-rust-windows-1.70: ] toolchain-alias: linux64-rust-windows-toolchain -linux64-rust-windows-1.73: +linux64-rust-windows-1.74: description: "rust repack with windows-cross support" treeherder: symbol: TL(rust-win) run: arguments: [ - '--channel', '1.73.0', + '--channel', '1.74.0', '--host', 'x86_64-unknown-linux-gnu', '--target', 'x86_64-unknown-linux-gnu', '--target', 'x86_64-pc-windows-msvc', @@ -214,12 +179,12 @@ linux64-rust-windows-1.73: ] toolchain-alias: linux64-rust-windows -win64-rust-1.73: +win64-rust-1.74: treeherder: symbol: TW64(rust) run: arguments: [ - '--channel', '1.73.0', + '--channel', '1.74.0', '--host', 'x86_64-pc-windows-msvc', '--target', 'x86_64-pc-windows-msvc', '--target', 'i686-pc-windows-msvc', @@ -227,23 +192,23 @@ win64-rust-1.73: ] toolchain-alias: win64-rust -macosx64-rust-1.73: +macosx64-rust-1.74: treeherder: symbol: TM(rust) run: arguments: [ - '--channel', '1.73.0', + '--channel', '1.74.0', '--host', 'x86_64-apple-darwin', '--target', 'x86_64-apple-darwin', ] toolchain-alias: macosx64-rust -mingw32-rust-1.73: +mingw32-rust-1.74: treeherder: symbol: TMW(rust) run: arguments: [ - '--channel', '1.73.0', + '--channel', '1.74.0', '--host', 'x86_64-unknown-linux-gnu', '--target', 'i686-unknown-linux-gnu', '--target', 'i686-pc-windows-gnu',