Bug 1765680 - Use toolchain aliases for rust dependencies for toolchains. r=firefox-build-system-reviewers,mhentges

While here, upgrade the rust toolchain used for lowercase. For some
reason it was stuck on 1.47.

Differential Revision: https://phabricator.services.mozilla.com/D144240
This commit is contained in:
Mike Hommey 2022-04-21 21:55:59 +00:00
parent 2accd3d077
commit 2e75f81b2e
9 changed files with 32 additions and 28 deletions

View File

@ -29,7 +29,7 @@ linux64-cbindgen:
fetches:
toolchain:
- linux64-clang-toolchain
- linux64-rust-1.57
- linux64-rust-toolchain
- sysroot-x86_64-linux-gnu
macosx64-cbindgen:
@ -41,7 +41,7 @@ macosx64-cbindgen:
toolchain:
- linux64-cctools-port
- linux64-clang-toolchain
- linux64-rust-macos-1.57
- linux64-rust-macos-toolchain
- macosx64-sdk-11.0
macosx64-aarch64-cbindgen:
@ -53,7 +53,7 @@ macosx64-aarch64-cbindgen:
toolchain:
- linux64-cctools-port
- linux64-clang-toolchain
- linux64-rust-macos-1.57
- linux64-rust-macos-toolchain
- macosx64-sdk-11.0
win64-cbindgen:
@ -64,5 +64,5 @@ win64-cbindgen:
arguments: ['x86_64-pc-windows-msvc']
fetches:
toolchain:
- win64-rust-1.57
- win64-rust-toolchain
- win64-vs2017

View File

@ -25,7 +25,7 @@ linux64-dump_syms:
toolchain:
- linux64-binutils
- linux64-clang-toolchain
- linux64-rust-1.57
- linux64-rust-toolchain
- sysroot-x86_64-linux-gnu
macosx64-dump_syms:
@ -37,7 +37,7 @@ macosx64-dump_syms:
toolchain-artifact: public/build/dump_syms.tar.zst
fetches:
toolchain:
- linux64-rust-macos-1.57
- linux64-rust-macos-toolchain
- linux64-clang-toolchain
- linux64-cctools-port
- macosx64-sdk-11.0
@ -51,7 +51,7 @@ macosx64-aarch64-dump_syms:
toolchain-artifact: public/build/dump_syms.tar.zst
fetches:
toolchain:
- linux64-rust-macos-1.57
- linux64-rust-macos-toolchain
- linux64-clang-toolchain
- linux64-cctools-port
- macosx64-sdk-11.0
@ -64,5 +64,5 @@ win64-dump_syms:
toolchain-artifact: public/build/dump_syms.tar.zst
fetches:
toolchain:
- win64-rust-1.57
- win64-rust-toolchain
- win64-vs2017

View File

@ -27,7 +27,7 @@ linux64-fix-stacks:
toolchain:
- linux64-binutils
- linux64-clang-toolchain
- linux64-rust-1.57
- linux64-rust-toolchain
- sysroot-x86_64-linux-gnu
macosx64-fix-stacks:
@ -39,7 +39,7 @@ macosx64-fix-stacks:
toolchain:
- linux64-cctools-port
- linux64-clang-toolchain
- linux64-rust-macos-1.57
- linux64-rust-macos-toolchain
- macosx64-sdk-11.0
macosx64-aarch64-fix-stacks:
@ -51,7 +51,7 @@ macosx64-aarch64-fix-stacks:
toolchain:
- linux64-cctools-port
- linux64-clang-toolchain
- linux64-rust-macos-1.57
- linux64-rust-macos-toolchain
- macosx64-sdk-11.0
win32-fix-stacks:
@ -63,7 +63,7 @@ win32-fix-stacks:
toolchain:
- linux64-clang-toolchain
- linux64-liblowercase
- linux64-rust-windows-1.57
- linux64-rust-windows-toolchain
- win64-vs2017
win64-fix-stacks:
@ -75,5 +75,5 @@ win64-fix-stacks:
toolchain:
- linux64-clang-toolchain
- linux64-liblowercase
- linux64-rust-windows-1.57
- linux64-rust-windows-toolchain
- win64-vs2017

View File

@ -19,7 +19,7 @@ linux64-grcov:
symbol: TL(grcov)
fetches:
toolchain:
- linux64-rust-1.57
- linux64-rust-toolchain
- linux64-clang-toolchain
- linux64-binutils
- sysroot-x86_64-linux-gnu
@ -30,5 +30,5 @@ win64-grcov:
worker-type: b-win2012
fetches:
toolchain:
- win64-rust-1.57
- win64-rust-toolchain
- win64-vs2017

View File

@ -27,7 +27,7 @@ linux64-minidump-stackwalk:
toolchain:
- linux64-binutils
- linux64-clang-toolchain
- linux64-rust-1.57
- linux64-rust-toolchain
- sysroot-x86_64-linux-gnu
macosx64-minidump-stackwalk:
@ -37,7 +37,7 @@ macosx64-minidump-stackwalk:
arguments: ['x86_64-apple-darwin']
fetches:
toolchain:
- linux64-rust-macos-1.57
- linux64-rust-macos-toolchain
- linux64-clang-toolchain
- linux64-cctools-port
- macosx64-sdk-11.0
@ -49,7 +49,7 @@ macosx64-aarch64-minidump-stackwalk:
arguments: ['aarch64-apple-darwin']
fetches:
toolchain:
- linux64-rust-macos-1.57
- linux64-rust-macos-toolchain
- linux64-clang-toolchain
- linux64-cctools-port
- macosx64-sdk-11.0
@ -63,7 +63,7 @@ win32-minidump-stackwalk:
toolchain:
- linux64-clang-toolchain
- linux64-liblowercase
- linux64-rust-windows-1.57
- linux64-rust-windows-toolchain
- win64-vs2017
win64-minidump-stackwalk:
@ -75,7 +75,7 @@ win64-minidump-stackwalk:
toolchain:
- linux64-clang-toolchain
- linux64-liblowercase
- linux64-rust-windows-1.57
- linux64-rust-windows-toolchain
- win64-vs2017
# This is a totally different thing but it used to share common code with

View File

@ -199,7 +199,7 @@ linux64-liblowercase:
- build/liblowercase/
fetches:
toolchain:
- linux64-rust-1.47
- linux64-rust-toolchain
linux64-wine:
description: "Wine build for Windows Cross Compile"
@ -298,7 +298,7 @@ linux64-makecab:
fetch:
- makecab
toolchain:
- linux64-rust-1.57
- linux64-rust-toolchain
win64-mozmake:
description: "mozmake for Windows"

View File

@ -20,7 +20,7 @@ linux64-rust-size:
toolchain-artifact: public/build/rust-size.tar.zst
fetches:
toolchain:
- linux64-rust-1.57
- linux64-rust-toolchain
win64-rust-size:
treeherder:
@ -30,5 +30,5 @@ win64-rust-size:
toolchain-artifact: public/build/rust-size.tar.zst
fetches:
toolchain:
- win64-rust-1.57
- win64-rust-toolchain
- win64-vs2017

View File

@ -41,6 +41,7 @@ linux64-rust-1.57:
'--target', 'wasm32-wasi',
'--compiler-builtins-hack',
]
toolchain-alias: linux64-rust-toolchain
fetches:
toolchain:
- linux64-clang-toolchain
@ -154,6 +155,7 @@ linux64-rust-macos-1.57:
'--target', 'x86_64-apple-darwin',
'--target', 'aarch64-apple-darwin',
]
toolchain-alias: linux64-rust-macos-toolchain
linux64-rust-macos-1.60:
description: "rust repack with macos-cross support"
@ -202,6 +204,7 @@ linux64-rust-windows-1.57:
'--target', 'x86_64-pc-windows-msvc',
'--target', 'i686-pc-windows-msvc',
]
toolchain-alias: linux64-rust-windows-toolchain
linux64-rust-windows-1.60:
description: "rust repack with windows-cross support"
@ -228,6 +231,7 @@ win64-rust-1.57:
'--target', 'i686-pc-windows-msvc',
'--target', 'aarch64-pc-windows-msvc',
]
toolchain-alias: win64-rust-toolchain
win64-rust-1.60:
treeherder:

View File

@ -26,7 +26,7 @@ linux64-sccache:
toolchain-artifact: public/build/sccache.tar.zst
fetches:
toolchain:
- linux64-rust-1.57
- linux64-rust-toolchain
- linux64-clang-toolchain
- linux64-binutils
- sysroot-x86_64-linux-gnu
@ -42,7 +42,7 @@ macosx64-sccache:
toolchain-artifact: public/build/sccache.tar.zst
fetches:
toolchain:
- linux64-rust-macos-1.57
- linux64-rust-macos-toolchain
- linux64-clang-toolchain
- linux64-cctools-port
- macosx64-sdk-11.0
@ -58,7 +58,7 @@ macosx64-aarch64-sccache:
toolchain-artifact: public/build/sccache.tar.zst
fetches:
toolchain:
- linux64-rust-macos-1.57
- linux64-rust-macos-toolchain
- linux64-clang-toolchain
- linux64-cctools-port
- macosx64-sdk-11.0
@ -73,5 +73,5 @@ win64-sccache:
toolchain-artifact: public/build/sccache.tar.zst
fetches:
toolchain:
- win64-rust-1.57
- win64-rust-toolchain
- win64-vs2017