Bug 1554286 - move Mac builds to Rust 1.36-beta; r=chmanchester
authorNathan Froyd <froydnj@mozilla.com>
Fri, 31 May 2019 17:50:38 +0000
changeset 476453 16872c13ee938da5981ee5ed3d66bf66aa4c7241
parent 476452 db5ce13659274e26e26b419b2342edf8eb24cdda
child 476454 646eb4b87fffed269a1aa83dac98daba73bcdcca
push id86855
push usernfroyd@mozilla.com
push dateFri, 31 May 2019 17:51:08 +0000
treeherderautoland@16872c13ee93 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerschmanchester
bugs1554286
milestone69.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1554286 - move Mac builds to Rust 1.36-beta; r=chmanchester We would like to switch to using cross-language LTO on all of our platforms, and we need to use a beta version of Rust on Mac to do that. Differential Revision: https://phabricator.services.mozilla.com/D33316
taskcluster/ci/toolchain/dist-toolchains.yml
taskcluster/ci/toolchain/rust.yml
toolkit/library/rust/shared/build.rs
--- a/taskcluster/ci/toolchain/dist-toolchains.yml
+++ b/taskcluster/ci/toolchain/dist-toolchains.yml
@@ -30,10 +30,10 @@ rustc-dist-toolchain:
     treeherder:
         symbol: TL(rustc-dist)
     worker:
         max-run-time: 1800
     run:
         arguments: ['rustc']
         toolchain-artifact: public/build/rustc-dist-toolchain.tar.xz
     toolchains:
-        - linux64-rust-macos-1.35
+        - linux64-rust-macos-1.36
         - linux64-sccache
--- a/taskcluster/ci/toolchain/rust.yml
+++ b/taskcluster/ci/toolchain/rust.yml
@@ -115,23 +115,23 @@ linux64-rust-macos-1.34:
     run:
         arguments: [
             '--channel', '1.34.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-apple-darwin',
         ]
 
-linux64-rust-macos-1.35:
+linux64-rust-macos-1.36:
     description: "rust repack with macos-cross support"
     treeherder:
         symbol: TL(rust-macos)
     run:
         arguments: [
-            '--channel', '1.35.0',
+            '--channel', 'beta-2019-05-30',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-apple-darwin',
         ]
         toolchain-alias: linux64-rust-macos
 
 linux64-rust-nightly-macos:
     description: "rust nightly repack with macos-cross support"
--- a/toolkit/library/rust/shared/build.rs
+++ b/toolkit/library/rust/shared/build.rs
@@ -1,16 +1,16 @@
 extern crate rustc_version;
 
 use rustc_version::{version, Version};
 
 fn main() {
     let ver = version().unwrap();
     let mut bootstrap = false;
-    let max_oom_hook_version = Version::parse("1.36.0-alpha").unwrap();
+    let max_oom_hook_version = Version::parse("1.37.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\"");
         bootstrap = true;
     } else if std::env::var("MOZ_AUTOMATION").is_ok() {
         panic!("Builds on automation must use a version of rust for which we know how to hook OOM: want < {}, have {}",
                max_oom_hook_version, ver);
     }