From 93c64c7edb51df6d4f89369c7efd47a3c61fbdc1 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Fri, 28 Oct 2022 03:53:25 +0000 Subject: [PATCH] Bug 1797869 - Bump minimum Rust version to 1.63. r=firefox-build-system-reviewers,nalexander Differential Revision: https://phabricator.services.mozilla.com/D160585 --- docs/writing-rust-code/update-policy.md | 4 ++-- python/mozboot/mozboot/util.py | 2 +- taskcluster/ci/build/linux-base-toolchains.yml | 8 ++++---- taskcluster/ci/toolchain/rust.yml | 13 +++++++++++++ 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/docs/writing-rust-code/update-policy.md b/docs/writing-rust-code/update-policy.md index 8ff6841496e4..59b17389f164 100644 --- a/docs/writing-rust-code/update-policy.md +++ b/docs/writing-rust-code/update-policy.md @@ -133,9 +133,9 @@ Here are the Rust versions for each Firefox version. | Firefox 104 | Rust 1.62.0 | 1.59.0 | 2022 June 30 | 2022 July 21 | 2022 August 23 | Firefox 105 | Rust 1.63.0 | 1.61.0 | 2022 August 11 | 2022 August 18 | 2022 September 20 | Firefox 106 | Rust 1.63.0 | 1.61.0 | 2022 August 11 | 2022 September 15 | 2022 October 18 +| Firefox 107 | Rust 1.64.0 | 1.61.0 | 2022 September 22 | 2022 October 13 | 2022 November 15 | **Estimated** | -| Firefox 107 | Rust 1.64.0 | ? | 2022 September 22 | 2022 October 13 | 2022 November 15 -| Firefox 108 | Rust 1.65.0 | ? | 2022 November 3 | 2022 November 10 | 2022 December 13 +| Firefox 108 | Rust 1.65.0 | 1.63.0 | 2022 November 3 | 2022 November 10 | 2022 December 13 | Firefox 109 | Rust 1.65.0 | ? | 2022 November 3 | 2022 December 8 | 2023 January 17 | Firefox 110 | Rust 1.66.0 | ? | 2022 December 15 | 2023 January 5 | 2023 February 14 | Firefox 111 | Rust 1.67.0 | ? | 2022 January 26 | 2023 February 9 | 2023 March 14 diff --git a/python/mozboot/mozboot/util.py b/python/mozboot/mozboot/util.py index 8e361600f0d0..2319de3159b5 100644 --- a/python/mozboot/mozboot/util.py +++ b/python/mozboot/mozboot/util.py @@ -23,7 +23,7 @@ if sys.version_info < (3,): else: from urllib.request import urlopen -MINIMUM_RUST_VERSION = "1.61.0" +MINIMUM_RUST_VERSION = "1.63.0" def get_tools_dir(srcdir=False): diff --git a/taskcluster/ci/build/linux-base-toolchains.yml b/taskcluster/ci/build/linux-base-toolchains.yml index b468ada1877a..5ca4756adad0 100644 --- a/taskcluster/ci/build/linux-base-toolchains.yml +++ b/taskcluster/ci/build/linux-base-toolchains.yml @@ -37,7 +37,7 @@ linux64-base-toolchains/opt: toolchain: - linux64-clang-5.0 - linux64-gcc-7 - - linux64-rust-1.61 + - linux64-rust-base - linux64-cbindgen - linux64-dump_syms - linux64-sccache @@ -77,7 +77,7 @@ linux64-base-toolchains/debug: toolchain: - linux64-clang-5.0 - linux64-gcc-7 - - linux64-rust-1.61 + - linux64-rust-base - linux64-cbindgen - linux64-dump_syms - linux64-sccache @@ -113,7 +113,7 @@ linux64-base-toolchains-clang/opt: toolchain: - linux64-binutils-2.31.1 - linux64-clang-5.0 - - linux64-rust-1.61 + - linux64-rust-base - linux64-cbindgen - linux64-dump_syms - linux64-nasm-2.14.02 @@ -151,7 +151,7 @@ linux64-base-toolchains-clang/debug: toolchain: - linux64-binutils-2.31.1 - linux64-clang-5.0 - - linux64-rust-1.61 + - linux64-rust-base - linux64-cbindgen - linux64-dump_syms - linux64-nasm-2.14.02 diff --git a/taskcluster/ci/toolchain/rust.yml b/taskcluster/ci/toolchain/rust.yml index 7c9d89451223..c03fe00b0e93 100644 --- a/taskcluster/ci/toolchain/rust.yml +++ b/taskcluster/ci/toolchain/rust.yml @@ -25,6 +25,19 @@ linux64-rust-1.61: ] toolchain-alias: linux64-rust-toolchain +linux64-rust-1.63: + treeherder: + symbol: TL(rust-1.63) + run: + arguments: [ + '--channel', '1.63.0', + '--host', 'x86_64-unknown-linux-gnu', + '--target', 'x86_64-unknown-linux-gnu', + '--target', 'i686-unknown-linux-gnu', + '--target', 'wasm32-wasi', + ] + toolchain-alias: linux64-rust-base + linux64-rust-1.64: treeherder: symbol: TL(rust)