From 0f4388b1de23871c235f605908d4b74629b01ac8 Mon Sep 17 00:00:00 2001 From: Cosmin Sabou Date: Wed, 12 Feb 2020 01:32:11 +0200 Subject: [PATCH] Backed out 2 changesets (bug 1605188) for causing valgrind bustages. CLOSED TREE Backed out changeset 1415d9d73a9b (bug 1605188) Backed out changeset 802aa1e10c54 (bug 1605188) --- taskcluster/ci/toolchain/cbindgen.yml | 6 +-- taskcluster/ci/toolchain/dist-toolchains.yml | 2 +- taskcluster/ci/toolchain/grcov.yml | 6 +-- .../ci/toolchain/minidump_stackwalk.yml | 6 +-- taskcluster/ci/toolchain/misc.yml | 2 +- taskcluster/ci/toolchain/rust-size.yml | 4 +- taskcluster/ci/toolchain/rust.yml | 38 +++++++------------ taskcluster/ci/toolchain/sccache.yml | 4 +- toolkit/library/rust/shared/build.rs | 2 +- 9 files changed, 29 insertions(+), 41 deletions(-) diff --git a/taskcluster/ci/toolchain/cbindgen.yml b/taskcluster/ci/toolchain/cbindgen.yml index 0f276e00f398..ffb979f11d59 100644 --- a/taskcluster/ci/toolchain/cbindgen.yml +++ b/taskcluster/ci/toolchain/cbindgen.yml @@ -25,7 +25,7 @@ linux64-cbindgen: arguments: ['x86_64-unknown-linux-gnu'] fetches: toolchain: - - linux64-rust-1.41 + - linux64-rust-1.39 macosx64-cbindgen: treeherder: @@ -46,7 +46,7 @@ macosx64-cbindgen: - linux64-cctools-port - linux64-clang-9 - linux64-llvm-dsymutil - - linux64-rust-macos-1.41 + - linux64-rust-macos-1.39 win64-cbindgen: treeherder: @@ -63,4 +63,4 @@ win64-cbindgen: tooltool-downloads: internal fetches: toolchain: - - win64-rust-1.41 + - win64-rust-1.39 diff --git a/taskcluster/ci/toolchain/dist-toolchains.yml b/taskcluster/ci/toolchain/dist-toolchains.yml index 34813e457fe0..694bf0b1b269 100644 --- a/taskcluster/ci/toolchain/dist-toolchains.yml +++ b/taskcluster/ci/toolchain/dist-toolchains.yml @@ -35,5 +35,5 @@ rustc-dist-toolchain: toolchain-artifact: public/build/rustc-dist-toolchain.tar.xz fetches: toolchain: - - linux64-rust-cross-1.41 + - linux64-rust-cross-1.39 - linux64-sccache diff --git a/taskcluster/ci/toolchain/grcov.yml b/taskcluster/ci/toolchain/grcov.yml index 62468fe6df61..53fc589bf70d 100644 --- a/taskcluster/ci/toolchain/grcov.yml +++ b/taskcluster/ci/toolchain/grcov.yml @@ -19,7 +19,7 @@ linux64-grcov: symbol: TL(grcov) fetches: toolchain: - - linux64-rust-1.41 + - linux64-rust-1.39 macosx64-grcov: treeherder: @@ -29,7 +29,7 @@ macosx64-grcov: - try fetches: toolchain: - - linux64-rust-1.41 + - linux64-rust-1.39 win64-grcov: treeherder: @@ -45,4 +45,4 @@ win64-grcov: tooltool-downloads: internal fetches: toolchain: - - win64-rust-1.41 + - win64-rust-1.39 diff --git a/taskcluster/ci/toolchain/minidump_stackwalk.yml b/taskcluster/ci/toolchain/minidump_stackwalk.yml index 0c96f60ad35f..abcf54c92dd1 100644 --- a/taskcluster/ci/toolchain/minidump_stackwalk.yml +++ b/taskcluster/ci/toolchain/minidump_stackwalk.yml @@ -33,7 +33,7 @@ linux64-minidump-stackwalk: toolchain: - linux64-clang-9 - linux64-binutils - - linux64-rust-1.41 + - linux64-rust-1.39 macosx64-minidump-stackwalk: treeherder: @@ -50,7 +50,7 @@ macosx64-minidump-stackwalk: toolchain: - linux64-cctools-port - linux64-clang-9 - - linux64-rust-macos-1.41 + - linux64-rust-macos-1.39 win32-minidump-stackwalk: treeherder: @@ -62,4 +62,4 @@ win32-minidump-stackwalk: fetches: toolchain: - linux64-clang-mingw-x86 - - mingw32-rust-1.41 + - mingw32-rust-1.39 diff --git a/taskcluster/ci/toolchain/misc.yml b/taskcluster/ci/toolchain/misc.yml index a79a13ad8e63..7d127629271e 100644 --- a/taskcluster/ci/toolchain/misc.yml +++ b/taskcluster/ci/toolchain/misc.yml @@ -208,7 +208,7 @@ wgpu-deps: fetch: - android-rs-glue toolchain: - - linux64-rust-1.41 # whatever m-c is built with + - linux64-rust-1.39 # whatever m-c is built with linux64-lucetc: description: "lucetc build process" diff --git a/taskcluster/ci/toolchain/rust-size.yml b/taskcluster/ci/toolchain/rust-size.yml index 4de6e0462aa4..6b632fa2dfaa 100644 --- a/taskcluster/ci/toolchain/rust-size.yml +++ b/taskcluster/ci/toolchain/rust-size.yml @@ -20,7 +20,7 @@ linux64-rust-size: toolchain-artifact: public/build/rust-size.tar.xz fetches: toolchain: - - linux64-rust-1.41 + - linux64-rust-1.39 win64-rust-size: treeherder: @@ -36,4 +36,4 @@ win64-rust-size: tooltool-downloads: internal fetches: toolchain: - - win64-rust-1.41 + - win64-rust-1.39 diff --git a/taskcluster/ci/toolchain/rust.yml b/taskcluster/ci/toolchain/rust.yml index 3cb39c07f618..5a3e69e2c878 100644 --- a/taskcluster/ci/toolchain/rust.yml +++ b/taskcluster/ci/toolchain/rust.yml @@ -12,23 +12,11 @@ job-defaults: toolchain-artifact: public/build/rustc.tar.xz linux64-rust-1.39: - treeherder: - symbol: TL(rust-1.39) - run: - arguments: [ - '--channel', '1.39.0', - '--host', 'x86_64-unknown-linux-gnu', - '--target', 'x86_64-unknown-linux-gnu', - '--target', 'i686-unknown-linux-gnu', - '--target', 'aarch64-unknown-linux-gnu', - ] - -linux64-rust-1.41: treeherder: symbol: TL(rust) run: arguments: [ - '--channel', '1.41.0', + '--channel', '1.39.0', '--host', 'x86_64-unknown-linux-gnu', '--target', 'x86_64-unknown-linux-gnu', '--target', 'i686-unknown-linux-gnu', @@ -48,13 +36,13 @@ linux64-rust-nightly: '--target', 'i686-unknown-linux-gnu', ] -linux64-rust-cross-1.41: +linux64-rust-cross-1.39: description: "rust repack with macos and windows cross support" treeherder: symbol: TL(rust-cross) run: arguments: [ - '--channel', '1.41.0', + '--channel', '1.39.0', '--host', 'x86_64-unknown-linux-gnu', '--target', 'x86_64-unknown-linux-gnu', '--target', 'x86_64-apple-darwin', @@ -63,26 +51,26 @@ linux64-rust-cross-1.41: '--target', 'aarch64-pc-windows-msvc', ] -linux64-rust-macos-1.41: +linux64-rust-macos-1.39: description: "rust repack with macos-cross support" treeherder: symbol: TL(rust-macos) run: arguments: [ - '--channel', '1.41.0', + '--channel', '1.39.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.39: description: "rust repack with android-cross support" treeherder: symbol: TL(rust-android) run: arguments: [ - '--channel', '1.41.0', + '--channel', '1.39.0', '--host', 'x86_64-unknown-linux-gnu', '--target', 'x86_64-unknown-linux-gnu', '--target', 'armv7-linux-androideabi', @@ -93,13 +81,13 @@ linux64-rust-android-1.41: ] toolchain-alias: linux64-rust-android -linux64-rust-windows-1.41: +linux64-rust-windows-1.39: description: "rust repack with windows-cross support" treeherder: symbol: TL(rust-win) run: arguments: [ - '--channel', '1.41.0', + '--channel', '1.39.0', '--host', 'x86_64-unknown-linux-gnu', '--target', 'x86_64-unknown-linux-gnu', '--target', 'x86_64-pc-windows-msvc', @@ -107,12 +95,12 @@ linux64-rust-windows-1.41: ] toolchain-alias: linux64-rust-windows -win64-rust-1.41: +win64-rust-1.39: treeherder: symbol: TW64(rust) run: arguments: [ - '--channel', '1.41.0', + '--channel', '1.39.0', '--host', 'x86_64-pc-windows-msvc', '--target', 'x86_64-pc-windows-msvc', '--target', 'i686-pc-windows-msvc', @@ -120,12 +108,12 @@ win64-rust-1.41: ] toolchain-alias: win64-rust -mingw32-rust-1.41: +mingw32-rust-1.39: treeherder: symbol: TMW(rust) run: arguments: [ - '--channel', '1.41.0', + '--channel', '1.39.0', '--host', 'x86_64-unknown-linux-gnu', '--target', 'i686-unknown-linux-gnu', '--target', 'i686-pc-windows-gnu', diff --git a/taskcluster/ci/toolchain/sccache.yml b/taskcluster/ci/toolchain/sccache.yml index ab52e1dcdf5a..c302b9bddd5d 100644 --- a/taskcluster/ci/toolchain/sccache.yml +++ b/taskcluster/ci/toolchain/sccache.yml @@ -47,7 +47,7 @@ macosx64-sccache: toolchain-artifact: public/build/sccache.tar.xz fetches: toolchain: - - linux64-rust-macos-1.41 + - linux64-rust-macos-1.39 - linux64-clang-9 - linux64-cctools-port - linux64-llvm-dsymutil @@ -68,4 +68,4 @@ win64-sccache: tooltool-downloads: internal fetches: toolchain: - - win64-rust-1.41 + - win64-rust-1.39 diff --git a/toolkit/library/rust/shared/build.rs b/toolkit/library/rust/shared/build.rs index 5de79f3caf0f..2855bf13de3e 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.41.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\"");