mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-27 23:02:20 +00:00
Bug 1789507 - Update builders to rustc 1.64. r=firefox-build-system-reviewers,andi
Differential Revision: https://phabricator.services.mozilla.com/D157896
This commit is contained in:
Mike Hommey
parent
b92d261a63
commit
f9a559f1ed
@ -254,13 +254,13 @@ index 000000000..4465a08a8
|
||||
+this file shouldn't be read
|
||||
\ No newline at end of file
|
||||
diff --git a/tests/testsuite/standard_lib.rs b/tests/testsuite/standard_lib.rs
|
||||
index 07b038b4a..6393b9ece 100644
|
||||
index d3be303ea..486a9b4e0 100644
|
||||
--- a/tests/testsuite/standard_lib.rs
|
||||
+++ b/tests/testsuite/standard_lib.rs
|
||||
@@ -27,71 +27,18 @@ fn setup() -> Option<Setup> {
|
||||
return None;
|
||||
}
|
||||
@@ -15,71 +15,18 @@ struct Setup {
|
||||
}
|
||||
|
||||
fn setup() -> Setup {
|
||||
- // Our mock sysroot requires a few packages from crates.io, so make sure
|
||||
- // they're "published" to crates.io. Also edit their code a bit to make sure
|
||||
- // that they have access to our custom crates with custom apis.
|
||||
@ -332,9 +332,9 @@ index 07b038b4a..6393b9ece 100644
|
||||
|
||||
let p = ProjectBuilder::new(paths::root().join("rustc-wrapper"))
|
||||
.file(
|
||||
@@ -327,6 +274,81 @@ fn depend_same_as_std() {
|
||||
None => return,
|
||||
};
|
||||
@@ -335,6 +282,81 @@ fn depend_same_as_std() {
|
||||
fn test() {
|
||||
let setup = setup();
|
||||
|
||||
+ // Our mock sysroot requires a few packages from crates.io, so make sure
|
||||
+ // they're "published" to crates.io. Also edit their code a bit to make sure
|
||||
|
||||
@ -131,8 +131,12 @@ Here are the Rust versions for each Firefox version.
|
||||
| Firefox 102 | Rust 1.60.0 | 1.59.0 | 2022 April 7 | 2022 May 26 | 2022 June 28
|
||||
| Firefox 103 | Rust 1.61.0 | 1.59.0 | 2022 May 19 | 2022 June 23 | 2022 July 27
|
||||
| Firefox 104 | Rust 1.62.0 | 1.59.0 | 2022 June 30 | 2022 July 21 | 2022 August 23
|
||||
| **Estimated** |
|
||||
| Firefox 105 | Rust 1.63.0 | 1.61.0 | 2022 August 11 | 2022 August 18 | 2022 September 20
|
||||
| Firefox 106 | Rust 1.63.0 | ? | 2022 August 11 | 2022 September 15 | 2022 October 18
|
||||
| Firefox 106 | Rust 1.63.0 | 1.61.0 | 2022 August 11 | 2022 September 15 | 2022 October 18
|
||||
| **Estimated** |
|
||||
| Firefox 107 | Rust 1.64.0 | ? | 2022 September 22 | 2022 October 13 | 2022 November 15
|
||||
| Firefox 108 | Rust 1.65.0 | ? | 2022 November 3 | 2022 November 10 | 2022 December 13
|
||||
| Firefox 109 | Rust 1.65.0 | ? | 2022 November 3 | 2022 December 8 | 2023 January 17
|
||||
| Firefox 110 | Rust 1.66.0 | ? | 2022 December 15 | 2023 January 5 | 2023 February 14
|
||||
| Firefox 111 | Rust 1.67.0 | ? | 2022 January 26 | 2023 February 9 | 2023 March 14
|
||||
| Firefox 112 | Rust 1.67.0 | ? | 2022 January 26 | 2023 March 9 | 2023 April 11
|
||||
|
||||
@ -16,7 +16,7 @@ fn main() {
|
||||
println!("cargo:rerun-if-changed=wrappers.cpp");
|
||||
|
||||
let ver = version().unwrap();
|
||||
let max_oom_hook_version = Version::parse("1.64.0-alpha").unwrap();
|
||||
let max_oom_hook_version = Version::parse("1.65.0-alpha").unwrap();
|
||||
|
||||
if ver < max_oom_hook_version {
|
||||
println!("cargo:rustc-cfg=feature=\"oom_with_hook\"");
|
||||
|
||||
@ -365,13 +365,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.63.0:
|
||||
description: Rust 1.63.0 source code
|
||||
rust-1.64.0:
|
||||
description: Rust 1.64.0 source code
|
||||
fetch:
|
||||
type: git
|
||||
include-dot-git: true
|
||||
repo: https://github.com/rust-lang/rust/
|
||||
revision: 4b91a6ea7258a947e59c6522cd5898e7c0a6a88f
|
||||
revision: a55dd71d5fb0ec5a6a3a9e8c27b2127ba491ce52
|
||||
|
||||
wasi-sdk:
|
||||
description: wasi-sdk-16 source code
|
||||
|
||||
@ -25,12 +25,12 @@ linux64-rust-1.61:
|
||||
]
|
||||
toolchain-alias: linux64-rust-toolchain
|
||||
|
||||
linux64-rust-1.63:
|
||||
linux64-rust-1.64:
|
||||
treeherder:
|
||||
symbol: TL(rust)
|
||||
run:
|
||||
arguments: [
|
||||
'--channel', '1.63.0',
|
||||
'--channel', '1.64.0',
|
||||
'--host', 'x86_64-unknown-linux-gnu',
|
||||
'--target', 'x86_64-unknown-linux-gnu',
|
||||
'--target', 'i686-unknown-linux-gnu',
|
||||
@ -60,19 +60,19 @@ linux64-rust-dev:
|
||||
]
|
||||
fetches:
|
||||
fetch:
|
||||
- rust-1.63.0
|
||||
- rust-1.64.0
|
||||
toolchain:
|
||||
- linux64-clang-toolchain
|
||||
- linux64-binutils
|
||||
|
||||
|
||||
linux64-rust-cross-1.63:
|
||||
linux64-rust-cross-1.64:
|
||||
description: "rust repack with macos and windows cross support"
|
||||
treeherder:
|
||||
symbol: TL(rust-cross)
|
||||
run:
|
||||
arguments: [
|
||||
'--channel', '1.63.0',
|
||||
'--channel', '1.64.0',
|
||||
'--host', 'x86_64-unknown-linux-gnu',
|
||||
'--target', 'x86_64-unknown-linux-gnu',
|
||||
'--target', 'i686-unknown-linux-gnu',
|
||||
@ -89,13 +89,13 @@ linux64-rust-cross-1.63:
|
||||
]
|
||||
toolchain-alias: linux64-rust-cross
|
||||
|
||||
linux64-rust-static-1.63:
|
||||
linux64-rust-static-1.64:
|
||||
description: "rust repack with static linking support"
|
||||
treeherder:
|
||||
symbol: TL(rust-static)
|
||||
run:
|
||||
arguments: [
|
||||
'--channel', '1.63.0',
|
||||
'--channel', '1.64.0',
|
||||
'--host', 'x86_64-unknown-linux-gnu',
|
||||
'--target', 'aarch64-unknown-linux-musl',
|
||||
'--target', 'x86_64-unknown-linux-gnu',
|
||||
@ -119,13 +119,13 @@ linux64-rust-macos-1.61:
|
||||
]
|
||||
toolchain-alias: linux64-rust-macos-toolchain
|
||||
|
||||
linux64-rust-macos-1.63:
|
||||
linux64-rust-macos-1.64:
|
||||
description: "rust repack with macos-cross support"
|
||||
treeherder:
|
||||
symbol: TL(rust-macos)
|
||||
run:
|
||||
arguments: [
|
||||
'--channel', '1.63.0',
|
||||
'--channel', '1.64.0',
|
||||
'--host', 'x86_64-unknown-linux-gnu',
|
||||
'--target', 'x86_64-unknown-linux-gnu',
|
||||
'--target', 'x86_64-apple-darwin',
|
||||
@ -133,13 +133,13 @@ linux64-rust-macos-1.63:
|
||||
]
|
||||
toolchain-alias: linux64-rust-macos
|
||||
|
||||
linux64-rust-android-1.63:
|
||||
linux64-rust-android-1.64:
|
||||
description: "rust repack with android-cross support"
|
||||
treeherder:
|
||||
symbol: TL(rust-android)
|
||||
run:
|
||||
arguments: [
|
||||
'--channel', '1.63.0',
|
||||
'--channel', '1.64.0',
|
||||
'--host', 'x86_64-unknown-linux-gnu',
|
||||
'--target', 'x86_64-unknown-linux-gnu',
|
||||
'--target', 'armv7-linux-androideabi',
|
||||
@ -168,13 +168,13 @@ linux64-rust-windows-1.61:
|
||||
]
|
||||
toolchain-alias: linux64-rust-windows-toolchain
|
||||
|
||||
linux64-rust-windows-1.63:
|
||||
linux64-rust-windows-1.64:
|
||||
description: "rust repack with windows-cross support"
|
||||
treeherder:
|
||||
symbol: TL(rust-win)
|
||||
run:
|
||||
arguments: [
|
||||
'--channel', '1.63.0',
|
||||
'--channel', '1.64.0',
|
||||
'--host', 'x86_64-unknown-linux-gnu',
|
||||
'--target', 'x86_64-unknown-linux-gnu',
|
||||
'--target', 'x86_64-pc-windows-msvc',
|
||||
@ -196,12 +196,12 @@ win64-rust-1.61:
|
||||
]
|
||||
toolchain-alias: win64-rust-toolchain
|
||||
|
||||
win64-rust-1.63:
|
||||
win64-rust-1.64:
|
||||
treeherder:
|
||||
symbol: TW64(rust)
|
||||
run:
|
||||
arguments: [
|
||||
'--channel', '1.63.0',
|
||||
'--channel', '1.64.0',
|
||||
'--host', 'x86_64-pc-windows-msvc',
|
||||
'--target', 'x86_64-pc-windows-msvc',
|
||||
'--target', 'i686-pc-windows-msvc',
|
||||
@ -209,23 +209,23 @@ win64-rust-1.63:
|
||||
]
|
||||
toolchain-alias: win64-rust
|
||||
|
||||
macosx64-rust-1.63:
|
||||
macosx64-rust-1.64:
|
||||
treeherder:
|
||||
symbol: TM(rust)
|
||||
run:
|
||||
arguments: [
|
||||
'--channel', '1.63.0',
|
||||
'--channel', '1.64.0',
|
||||
'--host', 'x86_64-apple-darwin',
|
||||
'--target', 'x86_64-apple-darwin',
|
||||
]
|
||||
toolchain-alias: macosx64-rust
|
||||
|
||||
mingw32-rust-1.63:
|
||||
mingw32-rust-1.64:
|
||||
treeherder:
|
||||
symbol: TMW(rust)
|
||||
run:
|
||||
arguments: [
|
||||
'--channel', '1.63.0',
|
||||
'--channel', '1.64.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