Skip to content

Commit

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

Differential Revision: https://phabricator.services.mozilla.com/D128808
  • Loading branch information
glandium committed Oct 21, 2021
1 parent a4da7b6 commit 907e218
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 32 deletions.
2 changes: 1 addition & 1 deletion mozglue/static/rust/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ fn main() {
println!("cargo:rerun-if-changed=wrappers.cpp");

let ver = version().unwrap();
let max_oom_hook_version = Version::parse("1.57.0-alpha").unwrap();
let max_oom_hook_version = Version::parse("1.58.0-alpha").unwrap();

if ver < max_oom_hook_version {
println!("cargo:rustc-cfg=feature=\"oom_with_hook\"");
Expand Down
14 changes: 7 additions & 7 deletions taskcluster/ci/fetch/toolchains.yml
Original file line number Diff line number Diff line change
Expand Up @@ -396,22 +396,22 @@ clang-trunk:
repo: https://github.com/llvm/llvm-project
branch: main

# This revision currently corresponds to rust nightly-2021-07-25,
# which is the first nightly with the version 1.56.0,
# This revision currently corresponds to rust nightly-2021-09-05,
# which is the first nightly with the version 1.57.0,
# so it should be as close as possible to the behaviour of
# stable-1.55.0.
# stable-1.56.0.
#
# We use this to build from source, so the resulting non-official
# artifacts will report their version as "1.56.0-dev", but will otherwise
# artifacts will report their version as "1.57.0-dev", but will otherwise
# behave like a nightly build. This means they will allow you to use
# unstable features like -Zbuild-std and sanitizers.
rust-1.56.0-dev:
description: Rust 1.56.0-dev source code
rust-1.57.0-dev:
description: Rust 1.57.0-dev source code
fetch:
type: git
include-dot-git: true
repo: https://github.com/rust-lang/rust/
revision: d9aa28767287670df6cf823b94629122e04442c0
revision: 5d2a410ff78247c418e28b69f7cad02bdd2168d6

wasi-sdk:
description: wasi-sdk source code
Expand Down
8 changes: 4 additions & 4 deletions taskcluster/ci/toolchain/dump-syms.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ linux64-dump_syms:
toolchain:
- linux64-binutils
- linux64-clang-13
- linux64-rust-1.55
- linux64-rust-1.56
- sysroot-x86_64-linux-gnu

macosx64-dump_syms:
Expand All @@ -37,7 +37,7 @@ macosx64-dump_syms:
toolchain-artifact: public/build/dump_syms.tar.zst
fetches:
toolchain:
- linux64-rust-macos-1.55
- linux64-rust-macos-1.56
- linux64-clang-13
- linux64-cctools-port-clang-13
- macosx64-sdk-11.0
Expand All @@ -51,7 +51,7 @@ macosx64-aarch64-dump_syms:
toolchain-artifact: public/build/dump_syms.tar.zst
fetches:
toolchain:
- linux64-rust-macos-1.55
- linux64-rust-macos-1.56
- linux64-clang-13
- linux64-cctools-port-clang-13
- macosx64-sdk-11.0
Expand All @@ -70,4 +70,4 @@ win64-dump_syms:
tooltool-downloads: internal
fetches:
toolchain:
- win64-rust-1.55
- win64-rust-1.56
40 changes: 20 additions & 20 deletions taskcluster/ci/toolchain/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ linux64-rust-1.53:
toolchain:
- linux64-clang

linux64-rust-1.55:
linux64-rust-1.56:
treeherder:
symbol: TL(rust)
run:
arguments: [
'--channel', '1.55.0',
'--channel', '1.56.0',
'--host', 'x86_64-unknown-linux-gnu',
'--target', 'x86_64-unknown-linux-gnu',
'--target', 'i686-unknown-linux-gnu',
Expand Down Expand Up @@ -80,19 +80,19 @@ linux64-rust-dev:
]
fetches:
fetch:
- rust-1.56.0-dev
- rust-1.57.0-dev
toolchain:
- linux64-clang
- linux64-binutils


linux64-rust-cross-1.55:
linux64-rust-cross-1.56:
description: "rust repack with macos and windows cross support"
treeherder:
symbol: TL(rust-cross)
run:
arguments: [
'--channel', '1.55.0',
'--channel', '1.56.0',
'--host', 'x86_64-unknown-linux-gnu',
'--target', 'x86_64-unknown-linux-gnu',
'--target', 'i686-unknown-linux-gnu',
Expand All @@ -109,13 +109,13 @@ linux64-rust-cross-1.55:
]
toolchain-alias: linux64-rust-cross

linux64-rust-static-1.55:
linux64-rust-static-1.56:
description: "rust repack with static linking support"
treeherder:
symbol: TL(rust-static)
run:
arguments: [
'--channel', '1.55.0',
'--channel', '1.56.0',
'--host', 'x86_64-unknown-linux-gnu',
'--target', 'x86_64-unknown-linux-gnu',
'--target', 'x86_64-unknown-linux-musl',
Expand Down Expand Up @@ -161,27 +161,27 @@ linux64-rust-macos-1.53:
'--target', 'x86_64-apple-darwin',
]

linux64-rust-macos-1.55:
linux64-rust-macos-1.56:
description: "rust repack with macos-cross support"
treeherder:
symbol: TL(rust-macos-1.55)
symbol: TL(rust-macos-1.56)
run:
arguments: [
'--channel', '1.55.0',
'--channel', '1.56.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.55:
linux64-rust-android-1.56:
description: "rust repack with android-cross support"
treeherder:
symbol: TL(rust-android)
run:
arguments: [
'--channel', '1.55.0',
'--channel', '1.56.0',
'--host', 'x86_64-unknown-linux-gnu',
'--target', 'x86_64-unknown-linux-gnu',
'--target', 'armv7-linux-androideabi',
Expand Down Expand Up @@ -222,13 +222,13 @@ linux64-rust-windows-1.53:
'--target', 'i686-pc-windows-msvc',
]

linux64-rust-windows-1.55:
linux64-rust-windows-1.56:
description: "rust repack with windows-cross support"
treeherder:
symbol: TL(rust-win)
run:
arguments: [
'--channel', '1.55.0',
'--channel', '1.56.0',
'--host', 'x86_64-unknown-linux-gnu',
'--target', 'x86_64-unknown-linux-gnu',
'--target', 'x86_64-pc-windows-msvc',
Expand Down Expand Up @@ -260,25 +260,25 @@ win64-rust-1.53:
'--target', 'aarch64-pc-windows-msvc',
]

win64-rust-1.55:
win64-rust-1.56:
treeherder:
symbol: TW64(rust)
run:
arguments: [
'--channel', '1.55.0',
'--channel', '1.56.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.55:
macosx64-rust-1.56:
treeherder:
symbol: TM(rust)
run:
arguments: [
'--channel', '1.55.0',
'--channel', '1.56.0',
'--host', 'x86_64-apple-darwin',
'--target', 'x86_64-apple-darwin',
]
Expand All @@ -297,12 +297,12 @@ mingw32-rust-1.53:
'--target', 'x86_64-unknown-linux-gnu',
]

mingw32-rust-1.55:
mingw32-rust-1.56:
treeherder:
symbol: TMW(rust)
run:
arguments: [
'--channel', '1.55.0',
'--channel', '1.56.0',
'--host', 'x86_64-unknown-linux-gnu',
'--target', 'i686-unknown-linux-gnu',
'--target', 'i686-pc-windows-gnu',
Expand Down

0 comments on commit 907e218

Please sign in to comment.