commit 11c3429a0c2944c22dfaaff3f29b461ce7dacdf3
parent 6098d437c69e0ac72d16910d18e49e4119411600
Author: Narcis Beleuzu <nbeleuzu@mozilla.com>
Date: Wed, 22 Oct 2025 10:55:43 +0300
Revert "Bug 1948826 - Update builders to rustc 1.87. r=firefox-build-system-reviewers,ahochheiden" for causing mochitest failures on Unified_cpp_ctypes_tests0.cpp
This reverts commit 6a6008bd586e09a409b23d4aa63765660ae87e18.
This reverts commit 53e5155d2f798d653ee508eff12c34e862aee00c.
Diffstat:
3 files changed, 62 insertions(+), 64 deletions(-)
diff --git a/docs/writing-rust-code/update-policy.md b/docs/writing-rust-code/update-policy.md
@@ -170,11 +170,9 @@ Here are the Rust versions for each Firefox version.
| Firefox 141 | Rust 1.86.0 | 1.82.0 | 2025 April 3 | 2025 June 19 | 2025 July 22
| Firefox 142 | Rust 1.86.0 | 1.82.0 | 2025 April 3 | 2025 July 17 | 2025 August 19
| Firefox 143 | Rust 1.86.0 | 1.82.0 | 2025 April 3 | 2025 August 14 | 2025 September 16
-| Firefox 144 | Rust 1.86.0 | 1.82.0 | 2025 April 3 | 2025 September 11 | 2025 October 14
-| Firefox 145 | Rust 1.86.0 | 1.82.0 | 2025 April 3 | 2025 October 9 | 2025 November 11
| **Estimated** |
+| Firefox 144 | Rust 1.89.0 | ? | 2025 August 7 | 2025 September 11 | 2025 October 14
+| Firefox 145 | Rust 1.90.0 | ? | 2025 September 18 | 2025 October 9 | 2025 November 11
| Firefox 146 | Rust 1.91.0 | ? | 2025 October 30 | 2025 November 6 | 2025 December 9
| Firefox 147 | Rust 1.91.0 | ? | 2025 October 30 | 2025 December 4 | 2026 January 13
| Firefox 148 | Rust 1.92.0 | ? | 2025 December 11 | 2026 January 8 | 2026 February 17
-| Firefox 149 | Rust 1.93.0 | ? | 2025 January 22 | 2026 February 19 | 2026 March 24
-| Firefox 150 | Rust 1.94.0 | ? | 2025 March 5 | 2026 March 19 | 2026 April 21
diff --git a/taskcluster/kinds/toolchain/clang.yml b/taskcluster/kinds/toolchain/clang.yml
@@ -108,6 +108,10 @@ linux64-clang-19-mingw-x86:
- 'x86'
resources:
- 'taskcluster/scripts/misc/mingw-*.patch'
+ toolchain-alias:
+ by-project:
+ toolchains: null
+ default: linux64-clang-mingw-x86
toolchain-artifact: public/build/clangmingw.tar.zst
fetches:
fetch:
@@ -130,6 +134,10 @@ linux64-clang-19-mingw-x64:
- 'x64'
resources:
- 'taskcluster/scripts/misc/mingw-*.patch'
+ toolchain-alias:
+ by-project:
+ toolchains: null
+ default: linux64-clang-mingw-x64
toolchain-artifact: public/build/clangmingw.tar.zst
fetches:
fetch:
@@ -155,6 +163,10 @@ linux64-clang-19-stage1:
- 'build/build-clang/use-system-clang.json'
- 'build/build-clang/clang-19.json'
- 'build/build-clang/stage-1.json'
+ toolchain-alias:
+ by-project:
+ toolchains: null
+ default: linux64-clang-toolchain
toolchain-artifact: public/build/clang.tar.zst
fetches:
fetch:
@@ -221,6 +233,10 @@ linux64-clang-19:
max-run-time: 600
run:
script: repack-clang.sh
+ toolchain-alias:
+ by-project:
+ toolchains: null
+ default: linux64-clang
toolchain-artifact: public/build/clang.tar.zst
fetches:
toolchain:
@@ -279,6 +295,10 @@ linux64-aarch64-clang-19:
max-run-time: 600
run:
script: repack-clang.sh
+ toolchain-alias:
+ by-project:
+ toolchains: null
+ default: linux64-aarch64-clang
toolchain-artifact: public/build/clang.tar.zst
fetches:
toolchain:
@@ -395,6 +415,12 @@ macosx64-clang-19:
max-run-time: 600
run:
script: repack-clang.sh
+ toolchain-alias:
+ by-project:
+ toolchains: null
+ default:
+ - macosx64-clang
+ - macosx64-clang-toolchain
toolchain-artifact: public/build/clang.tar.zst
fetches:
toolchain:
@@ -511,6 +537,10 @@ macosx64-aarch64-clang-19:
max-run-time: 600
run:
script: repack-clang.sh
+ toolchain-alias:
+ by-project:
+ toolchains: null
+ default: macosx64-aarch64-clang
toolchain-artifact: public/build/clang.tar.zst
fetches:
toolchain:
@@ -628,6 +658,12 @@ win64-clang-19:
max-run-time: 600
run:
script: repack-clang.sh
+ toolchain-alias:
+ by-project:
+ toolchains: null
+ default:
+ - win64-clang
+ - win64-clang-toolchain
toolchain-artifact: public/build/clang.tar.zst
fetches:
toolchain:
@@ -689,6 +725,10 @@ win64-aarch64-clang-19:
max-run-time: 600
run:
script: repack-clang.sh
+ toolchain-alias:
+ by-project:
+ toolchains: null
+ default: win64-aarch64-clang
toolchain-artifact: public/build/clang.tar.zst
fetches:
toolchain:
@@ -721,10 +761,6 @@ linux64-clang-20-mingw-x86:
- 'x86'
resources:
- 'taskcluster/scripts/misc/mingw-*.patch'
- toolchain-alias:
- by-project:
- toolchains: null
- default: linux64-clang-mingw-x86
toolchain-artifact: public/build/clangmingw.tar.zst
fetches:
fetch:
@@ -747,10 +783,6 @@ linux64-clang-20-mingw-x64:
- 'x64'
resources:
- 'taskcluster/scripts/misc/mingw-*.patch'
- toolchain-alias:
- by-project:
- toolchains: null
- default: linux64-clang-mingw-x64
toolchain-artifact: public/build/clangmingw.tar.zst
fetches:
fetch:
@@ -776,10 +808,6 @@ linux64-clang-20-stage1:
- 'build/build-clang/use-system-clang.json'
- 'build/build-clang/clang-20.json'
- 'build/build-clang/stage-1.json'
- toolchain-alias:
- by-project:
- toolchains: null
- default: linux64-clang-toolchain
toolchain-artifact: public/build/clang.tar.zst
fetches:
fetch:
@@ -846,10 +874,6 @@ linux64-clang-20:
max-run-time: 600
run:
script: repack-clang.sh
- toolchain-alias:
- by-project:
- toolchains: null
- default: linux64-clang
toolchain-artifact: public/build/clang.tar.zst
fetches:
toolchain:
@@ -908,10 +932,6 @@ linux64-aarch64-clang-20:
max-run-time: 600
run:
script: repack-clang.sh
- toolchain-alias:
- by-project:
- toolchains: null
- default: linux64-aarch64-clang
toolchain-artifact: public/build/clang.tar.zst
fetches:
toolchain:
@@ -1028,12 +1048,6 @@ macosx64-clang-20:
max-run-time: 600
run:
script: repack-clang.sh
- toolchain-alias:
- by-project:
- toolchains: null
- default:
- - macosx64-clang
- - macosx64-clang-toolchain
toolchain-artifact: public/build/clang.tar.zst
fetches:
toolchain:
@@ -1150,10 +1164,6 @@ macosx64-aarch64-clang-20:
max-run-time: 600
run:
script: repack-clang.sh
- toolchain-alias:
- by-project:
- toolchains: null
- default: macosx64-aarch64-clang
toolchain-artifact: public/build/clang.tar.zst
fetches:
toolchain:
@@ -1271,12 +1281,6 @@ win64-clang-20:
max-run-time: 600
run:
script: repack-clang.sh
- toolchain-alias:
- by-project:
- toolchains: null
- default:
- - win64-clang
- - win64-clang-toolchain
toolchain-artifact: public/build/clang.tar.zst
fetches:
toolchain:
@@ -1338,10 +1342,6 @@ win64-aarch64-clang-20:
max-run-time: 600
run:
script: repack-clang.sh
- toolchain-alias:
- by-project:
- toolchains: null
- default: win64-aarch64-clang
toolchain-artifact: public/build/clang.tar.zst
fetches:
toolchain:
diff --git a/taskcluster/kinds/toolchain/rust.yml b/taskcluster/kinds/toolchain/rust.yml
@@ -79,12 +79,12 @@ win64-rust-1.83:
'--target', 'x86_64-pc-windows-msvc',
]
-linux64-rust-1.87:
+linux64-rust-1.86:
treeherder:
symbol: TL(rust)
run:
arguments: [
- '--channel', '1.87.0',
+ '--channel', '1.86.0',
'--host', 'x86_64-unknown-linux-gnu',
'--target', 'x86_64-unknown-linux-gnu',
'--target', 'i686-unknown-linux-gnu',
@@ -143,13 +143,13 @@ linux64-rust-1.81-dev:
- linux64-clang-toolchain
- linux64-toolchain-sysroot
-linux64-rust-cross-1.87:
+linux64-rust-cross-1.86:
description: "rust repack with macos and windows cross support"
treeherder:
symbol: TL(rust-cross)
run:
arguments: [
- '--channel', '1.87.0',
+ '--channel', '1.86.0',
'--host', 'x86_64-unknown-linux-gnu',
'--target', 'x86_64-unknown-linux-gnu',
'--target', 'i686-unknown-linux-gnu',
@@ -169,13 +169,13 @@ linux64-rust-cross-1.87:
toolchains: null
default: linux64-rust-cross
-linux64-rust-static-1.87:
+linux64-rust-static-1.86:
description: "rust repack with static linking support"
treeherder:
symbol: TL(rust-static)
run:
arguments: [
- '--channel', '1.87.0',
+ '--channel', '1.86.0',
'--host', 'x86_64-unknown-linux-gnu',
'--target', 'aarch64-unknown-linux-musl',
'--target', 'x86_64-unknown-linux-gnu',
@@ -188,13 +188,13 @@ linux64-rust-static-1.87:
toolchains: null
default: linux64-rust-static
-linux64-rust-macos-1.87:
+linux64-rust-macos-1.86:
description: "rust repack with macos-cross support"
treeherder:
symbol: TL(rust-macos)
run:
arguments: [
- '--channel', '1.87.0',
+ '--channel', '1.86.0',
'--host', 'x86_64-unknown-linux-gnu',
'--target', 'x86_64-unknown-linux-gnu',
'--target', 'x86_64-apple-darwin',
@@ -205,13 +205,13 @@ linux64-rust-macos-1.87:
toolchains: null
default: linux64-rust-macos
-linux64-rust-ios-1.87:
+linux64-rust-ios-1.86:
description: "rust repack with ios-cross support"
treeherder:
symbol: TL(rust-ios)
run:
arguments: [
- '--channel', '1.87.0',
+ '--channel', '1.86.0',
'--host', 'x86_64-unknown-linux-gnu',
'--target', 'x86_64-unknown-linux-gnu',
'--target', 'aarch64-apple-ios',
@@ -222,13 +222,13 @@ linux64-rust-ios-1.87:
toolchains: null
default: linux64-rust-ios
-linux64-rust-android-1.87:
+linux64-rust-android-1.86:
description: "rust repack with android-cross support"
treeherder:
symbol: TL(rust-android)
run:
arguments: [
- '--channel', '1.87.0',
+ '--channel', '1.86.0',
'--host', 'x86_64-unknown-linux-gnu',
'--target', 'x86_64-unknown-linux-gnu',
'--target', 'armv7-linux-androideabi',
@@ -242,13 +242,13 @@ linux64-rust-android-1.87:
toolchains: null
default: linux64-rust-android
-linux64-rust-windows-1.87:
+linux64-rust-windows-1.86:
description: "rust repack with windows-cross support"
treeherder:
symbol: TL(rust-win)
run:
arguments: [
- '--channel', '1.87.0',
+ '--channel', '1.86.0',
'--host', 'x86_64-unknown-linux-gnu',
'--target', 'x86_64-unknown-linux-gnu',
'--target', 'x86_64-pc-windows-msvc',
@@ -260,12 +260,12 @@ linux64-rust-windows-1.87:
toolchains: null
default: linux64-rust-windows
-win64-rust-1.87:
+win64-rust-1.86:
treeherder:
symbol: TW64(rust)
run:
arguments: [
- '--channel', '1.87.0',
+ '--channel', '1.86.0',
'--host', 'x86_64-pc-windows-msvc',
'--target', 'x86_64-pc-windows-msvc',
'--target', 'i686-pc-windows-msvc',
@@ -276,12 +276,12 @@ win64-rust-1.87:
toolchains: null
default: win64-rust
-macosx64-rust-1.87:
+macosx64-rust-1.86:
treeherder:
symbol: TM(rust)
run:
arguments: [
- '--channel', '1.87.0',
+ '--channel', '1.86.0',
'--host', 'x86_64-apple-darwin',
'--target', 'x86_64-apple-darwin',
]
@@ -290,12 +290,12 @@ macosx64-rust-1.87:
toolchains: null
default: macosx64-rust
-mingw32-rust-1.87:
+mingw32-rust-1.86:
treeherder:
symbol: TMW(rust)
run:
arguments: [
- '--channel', '1.87.0',
+ '--channel', '1.86.0',
'--host', 'x86_64-unknown-linux-gnu',
'--target', 'i686-unknown-linux-gnu',
'--target', 'i686-pc-windows-gnu',
