mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-07 09:54:42 +00:00
Bug 1857090 - Update builders to rustc 1.75. r=firefox-build-system-reviewers,ahochheiden
Differential Revision: https://phabricator.services.mozilla.com/D197273
This commit is contained in:
parent
4d542e529c
commit
61cd516c19
@ -13,8 +13,8 @@ to make -Zbuild-std work in a vendored environment.
|
||||
|
||||
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
|
||||
index 3cb0eccd324..a3b8154c024 100644
|
||||
--- a/src/bootstrap/dist.rs
|
||||
+++ b/src/bootstrap/dist.rs
|
||||
--- a/src/bootstrap/src/core/build_steps/dist.rs
|
||||
+++ b/src/bootstrap/src/core/build_steps/dist.rs
|
||||
@@ -905,6 +905,31 @@ fn run(self, builder: &Builder<'_>) -> GeneratedTarball {
|
||||
builder.copy(&builder.src.join(file), &dst_src.join(file));
|
||||
}
|
||||
@ -49,8 +49,8 @@ index 3cb0eccd324..a3b8154c024 100644
|
||||
}
|
||||
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
|
||||
index 3ed53452309..1fc0d887748 100644
|
||||
--- a/src/bootstrap/lib.rs
|
||||
+++ b/src/bootstrap/lib.rs
|
||||
--- a/src/bootstrap/src/lib.rs
|
||||
+++ b/src/bootstrap/src/lib.rs
|
||||
@@ -1437,6 +1437,27 @@ fn read_stamp_file(&self, stamp: &Path) -> Vec<(PathBuf, DependencyType)> {
|
||||
paths
|
||||
}
|
||||
|
@ -148,11 +148,12 @@ Here are the Rust versions for each Firefox version.
|
||||
| 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
|
||||
| Firefox 122 | Rust 1.74.0 | 1.70.0 | 2023 November 16 | 2023 December 14 | 2024 January 23
|
||||
| **Estimated** |
|
||||
| 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
|
||||
| Firefox 125 | Rust 1.76.0 | ? | 2023 February 8 | 2024 March 14 | 2024 April 16
|
||||
| Firefox 126 | Rust 1.77.0 | ? | 2023 March 21 | 2024 April 19 | 2024 May 14
|
||||
| Firefox 127 | Rust 1.78.0 | ? | 2023 May 2 | 2024 May 9 | 2024 June 11
|
||||
| Firefox 128 | Rust 1.78.0 | ? | 2023 May 2 | 2024 June 6 | 2024 July 9
|
||||
| Firefox 129 | Rust 1.79.0 | ? | 2023 June 13 | 2024 July 4 | 2024 August 6
|
||||
|
@ -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.75.0-alpha").unwrap();
|
||||
let max_oom_hook_version = Version::parse("1.76.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.75.0-alpha").unwrap();
|
||||
let max_alloc_error_panic_version = Version::parse("1.76.0-alpha").unwrap();
|
||||
|
||||
if ver < max_oom_hook_version {
|
||||
println!("cargo:rustc-cfg=feature=\"oom_with_hook\"");
|
||||
|
@ -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.74.0:
|
||||
description: Rust 1.74.0 source code
|
||||
rust-1.75.0:
|
||||
description: Rust 1.75.0 source code
|
||||
fetch:
|
||||
type: git
|
||||
include-dot-git: true
|
||||
repo: https://github.com/rust-lang/rust/
|
||||
revision: 79e9716c980570bfd1f666e3b16ac583f0168962
|
||||
revision: 82e1608dfa6e0b5569232559e3d385fea5a93112
|
||||
|
||||
wasi-sdk-11:
|
||||
description: wasi-sdk-11 source code
|
||||
|
@ -26,12 +26,12 @@ linux64-rust-1.70:
|
||||
- linux64-rust-base
|
||||
- linux64-rust-toolchain
|
||||
|
||||
linux64-rust-1.74:
|
||||
linux64-rust-1.75:
|
||||
treeherder:
|
||||
symbol: TL(rust)
|
||||
run:
|
||||
arguments: [
|
||||
'--channel', '1.74.0',
|
||||
'--channel', '1.75.0',
|
||||
'--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.74.0
|
||||
- rust-1.75.0
|
||||
toolchain:
|
||||
- linux64-clang-toolchain
|
||||
- linux64-toolchain-sysroot
|
||||
|
||||
linux64-rust-cross-1.74:
|
||||
linux64-rust-cross-1.75:
|
||||
description: "rust repack with macos and windows cross support"
|
||||
treeherder:
|
||||
symbol: TL(rust-cross)
|
||||
run:
|
||||
arguments: [
|
||||
'--channel', '1.74.0',
|
||||
'--channel', '1.75.0',
|
||||
'--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.74:
|
||||
]
|
||||
toolchain-alias: linux64-rust-cross
|
||||
|
||||
linux64-rust-static-1.74:
|
||||
linux64-rust-static-1.75:
|
||||
description: "rust repack with static linking support"
|
||||
treeherder:
|
||||
symbol: TL(rust-static)
|
||||
run:
|
||||
arguments: [
|
||||
'--channel', '1.74.0',
|
||||
'--channel', '1.75.0',
|
||||
'--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.74:
|
||||
linux64-rust-macos-1.75:
|
||||
description: "rust repack with macos-cross support"
|
||||
treeherder:
|
||||
symbol: TL(rust-macos)
|
||||
run:
|
||||
arguments: [
|
||||
'--channel', '1.74.0',
|
||||
'--channel', '1.75.0',
|
||||
'--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.74:
|
||||
]
|
||||
toolchain-alias: linux64-rust-macos
|
||||
|
||||
linux64-rust-android-1.74:
|
||||
linux64-rust-android-1.75:
|
||||
description: "rust repack with android-cross support"
|
||||
treeherder:
|
||||
symbol: TL(rust-android)
|
||||
run:
|
||||
arguments: [
|
||||
'--channel', '1.74.0',
|
||||
'--channel', '1.75.0',
|
||||
'--host', 'x86_64-unknown-linux-gnu',
|
||||
'--target', 'x86_64-unknown-linux-gnu',
|
||||
'--target', 'armv7-linux-androideabi',
|
||||
@ -165,13 +165,13 @@ linux64-rust-windows-1.70:
|
||||
]
|
||||
toolchain-alias: linux64-rust-windows-toolchain
|
||||
|
||||
linux64-rust-windows-1.74:
|
||||
linux64-rust-windows-1.75:
|
||||
description: "rust repack with windows-cross support"
|
||||
treeherder:
|
||||
symbol: TL(rust-win)
|
||||
run:
|
||||
arguments: [
|
||||
'--channel', '1.74.0',
|
||||
'--channel', '1.75.0',
|
||||
'--host', 'x86_64-unknown-linux-gnu',
|
||||
'--target', 'x86_64-unknown-linux-gnu',
|
||||
'--target', 'x86_64-pc-windows-msvc',
|
||||
@ -180,12 +180,12 @@ linux64-rust-windows-1.74:
|
||||
]
|
||||
toolchain-alias: linux64-rust-windows
|
||||
|
||||
win64-rust-1.74:
|
||||
win64-rust-1.75:
|
||||
treeherder:
|
||||
symbol: TW64(rust)
|
||||
run:
|
||||
arguments: [
|
||||
'--channel', '1.74.0',
|
||||
'--channel', '1.75.0',
|
||||
'--host', 'x86_64-pc-windows-msvc',
|
||||
'--target', 'x86_64-pc-windows-msvc',
|
||||
'--target', 'i686-pc-windows-msvc',
|
||||
@ -193,23 +193,23 @@ win64-rust-1.74:
|
||||
]
|
||||
toolchain-alias: win64-rust
|
||||
|
||||
macosx64-rust-1.74:
|
||||
macosx64-rust-1.75:
|
||||
treeherder:
|
||||
symbol: TM(rust)
|
||||
run:
|
||||
arguments: [
|
||||
'--channel', '1.74.0',
|
||||
'--channel', '1.75.0',
|
||||
'--host', 'x86_64-apple-darwin',
|
||||
'--target', 'x86_64-apple-darwin',
|
||||
]
|
||||
toolchain-alias: macosx64-rust
|
||||
|
||||
mingw32-rust-1.74:
|
||||
mingw32-rust-1.75:
|
||||
treeherder:
|
||||
symbol: TMW(rust)
|
||||
run:
|
||||
arguments: [
|
||||
'--channel', '1.74.0',
|
||||
'--channel', '1.75.0',
|
||||
'--host', 'x86_64-unknown-linux-gnu',
|
||||
'--target', 'i686-unknown-linux-gnu',
|
||||
'--target', 'i686-pc-windows-gnu',
|
||||
|
Loading…
Reference in New Issue
Block a user