From e062c7cbfd25b8f336609afd8855744337b01d8a Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Wed, 29 Apr 2020 21:21:36 +0000 Subject: [PATCH] Bug 1632723 - Update builders to rustc 1.43. r=firefox-build-system-reviewers,rstewart Differential Revision: https://phabricator.services.mozilla.com/D72771 --- build/mozconfig.cache | 2 + taskcluster/ci/toolchain/rust.yml | 84 ++++++++++++++++++++++++---- taskcluster/ci/valgrind/kind.yml | 3 +- toolkit/library/rust/shared/build.rs | 2 +- 4 files changed, 79 insertions(+), 12 deletions(-) diff --git a/build/mozconfig.cache b/build/mozconfig.cache index 0d3261ad497c..d47e3404f176 100644 --- a/build/mozconfig.cache +++ b/build/mozconfig.cache @@ -78,5 +78,7 @@ if test -n "$bucket"; then fi export CCACHE="$MOZ_FETCHES_DIR/sccache/sccache" export SCCACHE_VERBOSE_STATS=1 + # Workaround for https://github.com/mozilla/sccache/issues/459#issuecomment-618756635 + mk_add_options "export SCCACHE_MAX_FRAME_LENGTH=50000000" mk_add_options MOZBUILD_MANAGE_SCCACHE_DAEMON=${MOZ_FETCHES_DIR}/sccache/sccache fi diff --git a/taskcluster/ci/toolchain/rust.yml b/taskcluster/ci/toolchain/rust.yml index 565088141816..26a0b3f85498 100644 --- a/taskcluster/ci/toolchain/rust.yml +++ b/taskcluster/ci/toolchain/rust.yml @@ -13,7 +13,7 @@ job-defaults: linux64-rust-1.41: treeherder: - symbol: TL(rust) + symbol: TL(rust-1.41) run: arguments: [ '--channel', '1.41.1', @@ -22,6 +22,18 @@ linux64-rust-1.41: '--target', 'i686-unknown-linux-gnu', '--target', 'aarch64-unknown-linux-gnu', ] + +linux64-rust-1.43: + treeherder: + symbol: TL(rust) + run: + arguments: [ + '--channel', '1.43.0', + '--host', 'x86_64-unknown-linux-gnu', + '--target', 'x86_64-unknown-linux-gnu', + '--target', 'i686-unknown-linux-gnu', + '--target', 'aarch64-unknown-linux-gnu', + ] toolchain-alias: linux64-rust linux64-rust-nightly: @@ -30,7 +42,7 @@ linux64-rust-nightly: symbol: TL(rust-nightly) run: arguments: [ - '--channel', 'nightly-2019-12-19', + '--channel', 'nightly-2020-03-17', '--host', 'x86_64-unknown-linux-gnu', '--target', 'x86_64-unknown-linux-gnu', '--target', 'i686-unknown-linux-gnu', @@ -39,7 +51,7 @@ linux64-rust-nightly: linux64-rust-cross-1.41: description: "rust repack with macos and windows cross support" treeherder: - symbol: TL(rust-cross) + symbol: TL(rust-cross-1.41) run: arguments: [ '--channel', '1.41.1', @@ -50,12 +62,27 @@ linux64-rust-cross-1.41: '--target', 'i686-pc-windows-msvc', '--target', 'aarch64-pc-windows-msvc', ] + +linux64-rust-cross-1.43: + description: "rust repack with macos and windows cross support" + treeherder: + symbol: TL(rust-cross) + run: + arguments: [ + '--channel', '1.43.0', + '--host', 'x86_64-unknown-linux-gnu', + '--target', 'x86_64-unknown-linux-gnu', + '--target', 'x86_64-apple-darwin', + '--target', 'x86_64-pc-windows-msvc', + '--target', 'i686-pc-windows-msvc', + '--target', 'aarch64-pc-windows-msvc', + ] toolchain-alias: linux64-rust-cross linux64-rust-macos-1.41: description: "rust repack with macos-cross support" treeherder: - symbol: TL(rust-macos) + symbol: TL(rust-macos-1.41) run: arguments: [ '--channel', '1.41.1', @@ -63,15 +90,27 @@ linux64-rust-macos-1.41: '--target', 'x86_64-unknown-linux-gnu', '--target', 'x86_64-apple-darwin', ] + +linux64-rust-macos-1.43: + description: "rust repack with macos-cross support" + treeherder: + symbol: TL(rust-macos) + run: + arguments: [ + '--channel', '1.43.0', + '--host', 'x86_64-unknown-linux-gnu', + '--target', 'x86_64-unknown-linux-gnu', + '--target', 'x86_64-apple-darwin', + ] toolchain-alias: linux64-rust-macos -linux64-rust-android-1.41: +linux64-rust-android-1.43: description: "rust repack with android-cross support" treeherder: symbol: TL(rust-android) run: arguments: [ - '--channel', '1.41.1', + '--channel', '1.43.0', '--host', 'x86_64-unknown-linux-gnu', '--target', 'x86_64-unknown-linux-gnu', '--target', 'armv7-linux-androideabi', @@ -82,13 +121,13 @@ linux64-rust-android-1.41: ] toolchain-alias: linux64-rust-android -linux64-rust-windows-1.41: +linux64-rust-windows-1.43: description: "rust repack with windows-cross support" treeherder: symbol: TL(rust-win) run: arguments: [ - '--channel', '1.41.1', + '--channel', '1.43.0', '--host', 'x86_64-unknown-linux-gnu', '--target', 'x86_64-unknown-linux-gnu', '--target', 'x86_64-pc-windows-msvc', @@ -98,7 +137,7 @@ linux64-rust-windows-1.41: win64-rust-1.41: treeherder: - symbol: TW64(rust) + symbol: TW64(rust-1.41) run: arguments: [ '--channel', '1.41.1', @@ -107,11 +146,23 @@ win64-rust-1.41: '--target', 'i686-pc-windows-msvc', '--target', 'aarch64-pc-windows-msvc', ] + +win64-rust-1.43: + treeherder: + symbol: TW64(rust) + run: + arguments: [ + '--channel', '1.43.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 mingw32-rust-1.41: treeherder: - symbol: TMW(rust) + symbol: TMW(rust-1.41) run: arguments: [ '--channel', '1.41.1', @@ -121,4 +172,17 @@ mingw32-rust-1.41: '--target', 'x86_64-pc-windows-gnu', '--target', 'x86_64-unknown-linux-gnu', ] + +mingw32-rust-1.43: + treeherder: + symbol: TMW(rust) + run: + arguments: [ + '--channel', '1.43.0', + '--host', 'x86_64-unknown-linux-gnu', + '--target', 'i686-unknown-linux-gnu', + '--target', 'i686-pc-windows-gnu', + '--target', 'x86_64-pc-windows-gnu', + '--target', 'x86_64-unknown-linux-gnu', + ] toolchain-alias: mingw32-rust diff --git a/taskcluster/ci/valgrind/kind.yml b/taskcluster/ci/valgrind/kind.yml index 864b73da5545..04a9dcd79ff2 100644 --- a/taskcluster/ci/valgrind/kind.yml +++ b/taskcluster/ci/valgrind/kind.yml @@ -49,7 +49,8 @@ jobs: toolchain: - linux64-binutils - linux64-clang - - linux64-rust + # bug 1632735 + - linux64-rust-1.41 - linux64-cbindgen - linux64-sccache - linux64-nasm diff --git a/toolkit/library/rust/shared/build.rs b/toolkit/library/rust/shared/build.rs index 5de79f3caf0f..ee96377fa60d 100644 --- a/toolkit/library/rust/shared/build.rs +++ b/toolkit/library/rust/shared/build.rs @@ -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.42.0-alpha").unwrap(); + let max_oom_hook_version = Version::parse("1.44.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\"");