Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 14:52:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1805805 - Update builders to rustc 1.68. r=firefox-build-system-reviewers,andi

Browse Source 
Keep the wrench android jobs on 1.67 until the NDK is upgraded in bug
1820876.

Differential Revision: https://phabricator.services.mozilla.com/D172078
This commit is contained in:
Mike Hommey 2023-03-22 04:11:05 +00:00
parent 3aae89afe5
commit ee90197d56
5 changed files with 47 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/writing-rust-code/update-policy.md
View File

@ -137,9 +137,9 @@ Here are the Rust versions for each Firefox version.
| Firefox 108 | Rust 1.65.0 | 1.63.0 | 2022 November 3 | 2022 November 10 | 2022 December 13
| Firefox 109 | Rust 1.65.0 | 1.63.0 | 2022 November 3 | 2022 December 8 | 2023 January 17
| Firefox 110 | Rust 1.66.0 | 1.65.0 | 2022 December 15 | 2023 January 12 | 2023 February 14
| Firefox 111 | Rust 1.67.0 | 1.65.0 | 2022 January 26 | 2023 February 9 | 2023 March 14
| Firefox 112 | Rust 1.67.0 | 1.65.0 | 2022 January 26 | 2023 March 9 | 2023 April 11
| **Estimated** |
| Firefox 111 | Rust 1.67.0 | ? | 2022 January 26 | 2023 February 9 | 2023 March 14
| Firefox 112 | Rust 1.67.0 | ? | 2022 January 26 | 2023 March 9 | 2023 April 11
| Firefox 113 | Rust 1.68.0 | ? | 2022 March 9 | 2023 April 6 | 2023 May 9
| Firefox 114 | Rust 1.69.0 | ? | 2022 April 20 | 2023 May 4 | 2023 June 6
| Firefox 115 | Rust 1.69.0 | ? | 2022 April 20 | 2023 June 1 | 2023 July 4

2
mozglue/static/rust/build.rs
View File

@ -16,7 +16,7 @@ fn main() {
println!("cargo:rerun-if-changed=wrappers.cpp");
let ver = version().unwrap();
let max_oom_hook_version = Version::parse("1.68.0-alpha").unwrap();
let max_oom_hook_version = Version::parse("1.69.0-alpha").unwrap();
if ver < max_oom_hook_version {
println!("cargo:rustc-cfg=feature=\"oom_with_hook\"");

6
taskcluster/ci/fetch/toolchains.yml
View File

@ -378,13 +378,13 @@ clang-trunk:
# We build stable rust from source so the resulting compiler acts as a nightly
# rust compiler, allowing to use unstable features like -Zbuild-std and
# sanitizers.
rust-1.67.0:
description: Rust 1.67.0 source code
rust-1.68.0:
description: Rust 1.68.0 source code
fetch:
type: git
include-dot-git: true
repo: https://github.com/rust-lang/rust/
revision: fc594f15669680fa70d255faec3ca3fb507c3405
revision: 2c8cc343237b8f7d5a3c3703e3a87f2eb2c54a74
wasi-sdk:
description: wasi-sdk-16 source code

58
taskcluster/ci/toolchain/rust.yml
View File

@ -26,12 +26,12 @@ linux64-rust-1.65:
- linux64-rust-base
- linux64-rust-toolchain
linux64-rust-1.67:
linux64-rust-1.68:
treeherder:
symbol: TL(rust)
run:
arguments: [
'--channel', '1.67.0',
'--channel', '1.68.0',
'--host', 'x86_64-unknown-linux-gnu',
'--target', 'x86_64-unknown-linux-gnu',
'--target', 'i686-unknown-linux-gnu',
@ -49,7 +49,7 @@ linux64-rust-beta:
symbol: TL(rust-beta)
run:
arguments: [
'--channel', '1.67.0',
'--channel', '1.68.0',
'--host', 'x86_64-unknown-linux-gnu',
'--target', 'x86_64-unknown-linux-gnu',
'--target', 'i686-unknown-linux-gnu',
@ -83,17 +83,17 @@ linux64-rust-dev:
]
fetches:
fetch:
- rust-1.67.0
- rust-1.68.0
toolchain:
- linux64-clang-toolchain
linux64-rust-cross-1.67:
linux64-rust-cross-1.68:
description: "rust repack with macos and windows cross support"
treeherder:
symbol: TL(rust-cross)
run:
arguments: [
'--channel', '1.67.0',
'--channel', '1.68.0',
'--host', 'x86_64-unknown-linux-gnu',
'--target', 'x86_64-unknown-linux-gnu',
'--target', 'i686-unknown-linux-gnu',
@ -132,13 +132,13 @@ linux64-rust-cross-beta:
'--target', 'x86_64-linux-android',
]
linux64-rust-static-1.67:
linux64-rust-static-1.68:
description: "rust repack with static linking support"
treeherder:
symbol: TL(rust-static)
run:
arguments: [
'--channel', '1.67.0',
'--channel', '1.68.0',
'--host', 'x86_64-unknown-linux-gnu',
'--target', 'aarch64-unknown-linux-musl',
'--target', 'x86_64-unknown-linux-gnu',
@ -162,13 +162,13 @@ linux64-rust-macos-1.65:
]
toolchain-alias: linux64-rust-macos-toolchain
linux64-rust-macos-1.67:
linux64-rust-macos-1.68:
description: "rust repack with macos-cross support"
treeherder:
symbol: TL(rust-macos)
run:
arguments: [
'--channel', '1.67.0',
'--channel', '1.68.0',
'--host', 'x86_64-unknown-linux-gnu',
'--target', 'x86_64-unknown-linux-gnu',
'--target', 'x86_64-apple-darwin',
@ -179,7 +179,7 @@ linux64-rust-macos-1.67:
linux64-rust-android-1.67:
description: "rust repack with android-cross support"
treeherder:
symbol: TL(rust-android)
symbol: TL(rust-android-1.67)
run:
arguments: [
'--channel', '1.67.0',
@ -192,6 +192,26 @@ linux64-rust-android-1.67:
'--target', 'x86_64-linux-android',
'--compiler-builtins-hack',
]
fetches:
toolchain:
- linux64-clang-toolchain
linux64-rust-android-1.68:
description: "rust repack with android-cross support"
treeherder:
symbol: TL(rust-android)
run:
arguments: [
'--channel', '1.68.0',
'--host', 'x86_64-unknown-linux-gnu',
'--target', 'x86_64-unknown-linux-gnu',
'--target', 'armv7-linux-androideabi',
'--target', 'thumbv7neon-linux-androideabi',
'--target', 'aarch64-linux-android',
'--target', 'i686-linux-android',
'--target', 'x86_64-linux-android',
'--compiler-builtins-hack',
]
toolchain-alias: linux64-rust-android
fetches:
toolchain:
@ -211,13 +231,13 @@ linux64-rust-windows-1.65:
]
toolchain-alias: linux64-rust-windows-toolchain
linux64-rust-windows-1.67:
linux64-rust-windows-1.68:
description: "rust repack with windows-cross support"
treeherder:
symbol: TL(rust-win)
run:
arguments: [
'--channel', '1.67.0',
'--channel', '1.68.0',
'--host', 'x86_64-unknown-linux-gnu',
'--target', 'x86_64-unknown-linux-gnu',
'--target', 'x86_64-pc-windows-msvc',
@ -226,12 +246,12 @@ linux64-rust-windows-1.67:
]
toolchain-alias: linux64-rust-windows
win64-rust-1.67:
win64-rust-1.68:
treeherder:
symbol: TW64(rust)
run:
arguments: [
'--channel', '1.67.0',
'--channel', '1.68.0',
'--host', 'x86_64-pc-windows-msvc',
'--target', 'x86_64-pc-windows-msvc',
'--target', 'i686-pc-windows-msvc',
@ -239,23 +259,23 @@ win64-rust-1.67:
]
toolchain-alias: win64-rust
macosx64-rust-1.67:
macosx64-rust-1.68:
treeherder:
symbol: TM(rust)
run:
arguments: [
'--channel', '1.67.0',
'--channel', '1.68.0',
'--host', 'x86_64-apple-darwin',
'--target', 'x86_64-apple-darwin',
]
toolchain-alias: macosx64-rust
mingw32-rust-1.67:
mingw32-rust-1.68:
treeherder:
symbol: TMW(rust)
run:
arguments: [
'--channel', '1.67.0',
'--channel', '1.68.0',
'--host', 'x86_64-unknown-linux-gnu',
'--target', 'i686-unknown-linux-gnu',
'--target', 'i686-pc-windows-gnu',

4
taskcluster/ci/webrender/kind.yml
View File

@ -272,7 +272,7 @@ jobs:
- android-system-image-x86_64-linux
- android-avd-x86_64-linux
- linux64-jdk
- linux64-rust-android
- linux64-rust-android-1.67
- wrench-deps
treeherder:
platform: android-em-7-0-x86/debug
@ -317,7 +317,7 @@ jobs:
- android-system-image-x86_64-linux
- android-avd-x86_64-linux
- linux64-jdk
- linux64-rust-android
- linux64-rust-android-1.67
- wrench-deps
treeherder:
platform: android-em-7-0-x86/opt