Skip to content

Commit

Permalink
Bug 1700562 - Update builders to rustc 1.51. r=firefox-build-system-r…
Browse files Browse the repository at this point in the history
…eviewers,andi,mhentges

Differential Revision: https://phabricator.services.mozilla.com/D109850
  • Loading branch information
glandium committed Mar 30, 2021
1 parent b3b9a2d commit b8c3926
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 21 deletions.
40 changes: 20 additions & 20 deletions taskcluster/ci/toolchain/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ linux64-rust-1.47:
toolchain:
- linux64-clang

linux64-rust-1.50:
linux64-rust-1.51:
treeherder:
symbol: TL(rust)
run:
arguments: [
'--channel', '1.50.0',
'--channel', '1.51.0',
'--host', 'x86_64-unknown-linux-gnu',
'--target', 'x86_64-unknown-linux-gnu',
'--target', 'i686-unknown-linux-gnu',
Expand All @@ -52,7 +52,7 @@ linux64-rust-nightly:
arguments: [
# First nightly with the version after 1.49.0, so that it's the
# closest to 1.49 release that has a bigger version number.
# This can't be upgraded to the first with the version after 1.50.0
# This can't be upgraded to the first with the version after 1.51.0
# because of https://github.com/rust-lang/rust/pull/80082, which
# reverted the changes needed to use -Zbuild-std in TSAN builds.
'--channel', 'nightly-2020-11-14',
Expand Down Expand Up @@ -82,13 +82,13 @@ linux64-rust-dev:
- linux64-binutils


linux64-rust-cross-1.50:
linux64-rust-cross-1.51:
description: "rust repack with macos and windows cross support"
treeherder:
symbol: TL(rust-cross)
run:
arguments: [
'--channel', '1.50.0',
'--channel', '1.51.0',
'--host', 'x86_64-unknown-linux-gnu',
'--target', 'x86_64-unknown-linux-gnu',
'--target', 'i686-unknown-linux-gnu',
Expand All @@ -105,13 +105,13 @@ linux64-rust-cross-1.50:
]
toolchain-alias: linux64-rust-cross

linux64-rust-static-1.50:
linux64-rust-static-1.51:
description: "rust repack with static linking support"
treeherder:
symbol: TL(rust-static)
run:
arguments: [
'--channel', '1.50.0',
'--channel', '1.51.0',
'--host', 'x86_64-unknown-linux-gnu',
'--target', 'x86_64-unknown-linux-gnu',
'--target', 'x86_64-unknown-linux-musl',
Expand Down Expand Up @@ -145,27 +145,27 @@ linux64-rust-macos-1.49:
'--target', 'aarch64-apple-darwin',
]

linux64-rust-macos-1.50:
linux64-rust-macos-1.51:
description: "rust repack with macos-cross support"
treeherder:
symbol: TL(rust-macos-1.50)
symbol: TL(rust-macos-1.51)
run:
arguments: [
'--channel', '1.50.0',
'--channel', '1.51.0',
'--host', 'x86_64-unknown-linux-gnu',
'--target', 'x86_64-unknown-linux-gnu',
'--target', 'x86_64-apple-darwin',
'--target', 'aarch64-apple-darwin',
]
toolchain-alias: linux64-rust-macos

linux64-rust-android-1.50:
linux64-rust-android-1.51:
description: "rust repack with android-cross support"
treeherder:
symbol: TL(rust-android)
run:
arguments: [
'--channel', '1.50.0',
'--channel', '1.51.0',
'--host', 'x86_64-unknown-linux-gnu',
'--target', 'x86_64-unknown-linux-gnu',
'--target', 'armv7-linux-androideabi',
Expand Down Expand Up @@ -193,13 +193,13 @@ linux64-rust-windows-1.47:
'--target', 'i686-pc-windows-msvc',
]

linux64-rust-windows-1.50:
linux64-rust-windows-1.51:
description: "rust repack with windows-cross support"
treeherder:
symbol: TL(rust-win)
run:
arguments: [
'--channel', '1.50.0',
'--channel', '1.51.0',
'--host', 'x86_64-unknown-linux-gnu',
'--target', 'x86_64-unknown-linux-gnu',
'--target', 'x86_64-pc-windows-msvc',
Expand All @@ -219,25 +219,25 @@ win64-rust-1.47:
'--target', 'aarch64-pc-windows-msvc',
]

win64-rust-1.50:
win64-rust-1.51:
treeherder:
symbol: TW64(rust)
run:
arguments: [
'--channel', '1.50.0',
'--channel', '1.51.0',
'--host', 'x86_64-pc-windows-msvc',
'--target', 'x86_64-pc-windows-msvc',
'--target', 'i686-pc-windows-msvc',
'--target', 'aarch64-pc-windows-msvc',
]
toolchain-alias: win64-rust

macosx64-rust-1.50:
macosx64-rust-1.51:
treeherder:
symbol: TM(rust)
run:
arguments: [
'--channel', '1.50.0',
'--channel', '1.51.0',
'--host', 'x86_64-apple-darwin',
'--target', 'x86_64-apple-darwin',
]
Expand All @@ -256,12 +256,12 @@ mingw32-rust-1.47:
'--target', 'x86_64-unknown-linux-gnu',
]

mingw32-rust-1.50:
mingw32-rust-1.51:
treeherder:
symbol: TMW(rust)
run:
arguments: [
'--channel', '1.50.0',
'--channel', '1.51.0',
'--host', 'x86_64-unknown-linux-gnu',
'--target', 'i686-unknown-linux-gnu',
'--target', 'i686-pc-windows-gnu',
Expand Down
2 changes: 1 addition & 1 deletion toolkit/library/rust/shared/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use rustc_version::{version, Version};
fn main() {
let ver = version().unwrap();
let mut bootstrap = false;
let max_oom_hook_version = Version::parse("1.51.0-alpha").unwrap();
let max_oom_hook_version = Version::parse("1.52.0-alpha").unwrap();

if ver >= Version::parse("1.28.0-alpha").unwrap() && ver < max_oom_hook_version {
println!("cargo:rustc-cfg=feature=\"oom_with_hook\"");
Expand Down

0 comments on commit b8c3926

Please sign in to comment.