diff --git a/taskcluster/ci/toolchain/cbindgen.yml b/taskcluster/ci/toolchain/cbindgen.yml index 91717681938e..77c5e691b978 100644 --- a/taskcluster/ci/toolchain/cbindgen.yml +++ b/taskcluster/ci/toolchain/cbindgen.yml @@ -28,7 +28,7 @@ linux64-cbindgen: arguments: ['x86_64-unknown-linux-gnu'] fetches: toolchain: - - linux64-clang-13 + - linux64-clang-toolchain - linux64-rust-1.57 - sysroot-x86_64-linux-gnu @@ -40,7 +40,7 @@ macosx64-cbindgen: fetches: toolchain: - linux64-cctools-port-clang-13 - - linux64-clang-13 + - linux64-clang-toolchain - linux64-rust-macos-1.57 - macosx64-sdk-11.0 @@ -52,7 +52,7 @@ macosx64-aarch64-cbindgen: fetches: toolchain: - linux64-cctools-port-clang-13 - - linux64-clang-13 + - linux64-clang-toolchain - linux64-rust-macos-1.57 - macosx64-sdk-11.0 diff --git a/taskcluster/ci/toolchain/clang.yml b/taskcluster/ci/toolchain/clang.yml index 9870d7430169..bef43f9620da 100644 --- a/taskcluster/ci/toolchain/clang.yml +++ b/taskcluster/ci/toolchain/clang.yml @@ -117,7 +117,9 @@ linux64-clang-13: resources: - 'build/build-clang/linux64.json' - 'build/build-clang/clang-13.json' - toolchain-alias: linux64-clang + toolchain-alias: + - linux64-clang + - linux64-clang-toolchain toolchain-artifact: public/build/clang.tar.zst fetches: fetch: @@ -265,7 +267,9 @@ macosx64-clang-13: - trunk run: script: repack-clang-linux-macosx-cross.sh - toolchain-alias: macosx64-clang + toolchain-alias: + - macosx64-clang + - macosx64-clang-toolchain toolchain-artifact: public/build/clang.tar.zst dependencies: macosx64-aarch64-compiler-rt-13: toolchain-macosx64-aarch64-compiler-rt-13 @@ -359,7 +363,9 @@ win64-clang-13: - 'build/build-clang/win64.json' - 'build/build-clang/clang-13.json' - 'taskcluster/scripts/misc/tooltool-download.sh' - toolchain-alias: win64-clang + toolchain-alias: + - win64-clang + - win64-clang-toolchain toolchain-artifact: public/build/clang.tar.zst tooltool-downloads: internal fetches: diff --git a/taskcluster/ci/toolchain/dump-syms.yml b/taskcluster/ci/toolchain/dump-syms.yml index 2c32ee983c0c..87f71db0f114 100644 --- a/taskcluster/ci/toolchain/dump-syms.yml +++ b/taskcluster/ci/toolchain/dump-syms.yml @@ -24,7 +24,7 @@ linux64-dump_syms: fetches: toolchain: - linux64-binutils - - linux64-clang-13 + - linux64-clang-toolchain - linux64-rust-1.57 - sysroot-x86_64-linux-gnu @@ -38,7 +38,7 @@ macosx64-dump_syms: fetches: toolchain: - linux64-rust-macos-1.57 - - linux64-clang-13 + - linux64-clang-toolchain - linux64-cctools-port-clang-13 - macosx64-sdk-11.0 @@ -52,7 +52,7 @@ macosx64-aarch64-dump_syms: fetches: toolchain: - linux64-rust-macos-1.57 - - linux64-clang-13 + - linux64-clang-toolchain - linux64-cctools-port-clang-13 - macosx64-sdk-11.0 diff --git a/taskcluster/ci/toolchain/fix-stacks.yml b/taskcluster/ci/toolchain/fix-stacks.yml index 928db76671b1..574ae1076c48 100644 --- a/taskcluster/ci/toolchain/fix-stacks.yml +++ b/taskcluster/ci/toolchain/fix-stacks.yml @@ -26,7 +26,7 @@ linux64-fix-stacks: fetches: toolchain: - linux64-binutils - - linux64-clang-13 + - linux64-clang-toolchain - linux64-rust-1.57 - sysroot-x86_64-linux-gnu @@ -39,7 +39,7 @@ macosx64-fix-stacks: fetches: toolchain: - linux64-cctools-port-clang-13 - - linux64-clang-13 + - linux64-clang-toolchain - linux64-rust-macos-1.57 - macosx64-sdk-11.0 @@ -52,7 +52,7 @@ macosx64-aarch64-fix-stacks: fetches: toolchain: - linux64-cctools-port-clang-13 - - linux64-clang-13 + - linux64-clang-toolchain - linux64-rust-macos-1.57 - macosx64-sdk-11.0 @@ -70,6 +70,6 @@ win32-fix-stacks: tooltool-downloads: internal fetches: toolchain: - - linux64-clang-13 + - linux64-clang-toolchain - linux64-liblowercase - linux64-rust-windows-1.57 diff --git a/taskcluster/ci/toolchain/geckodriver.yml b/taskcluster/ci/toolchain/geckodriver.yml index 61bd13a3e6d6..c2326ee27a2b 100644 --- a/taskcluster/ci/toolchain/geckodriver.yml +++ b/taskcluster/ci/toolchain/geckodriver.yml @@ -61,7 +61,7 @@ macosx64-geckodriver: fetches: toolchain: - linux64-cctools-port - - linux64-clang + - linux64-clang-toolchain - linux64-rust-macos - macosx64-sdk-11.0 @@ -76,7 +76,7 @@ macosx64-aarch64-geckodriver: fetches: toolchain: - linux64-cctools-port - - linux64-clang + - linux64-clang-toolchain - linux64-rust-macos - macosx64-sdk-11.0 @@ -97,7 +97,7 @@ win32-geckodriver: build_platform: win32-geckodriver fetches: toolchain: - - linux64-clang + - linux64-clang-toolchain - linux64-liblowercase - linux64-rust-windows @@ -118,6 +118,6 @@ win64-geckodriver: build_platform: win64-geckodriver fetches: toolchain: - - linux64-clang + - linux64-clang-toolchain - linux64-liblowercase - linux64-rust-windows diff --git a/taskcluster/ci/toolchain/gn.yml b/taskcluster/ci/toolchain/gn.yml index 12c79ff51f92..2b6916bde65b 100644 --- a/taskcluster/ci/toolchain/gn.yml +++ b/taskcluster/ci/toolchain/gn.yml @@ -31,7 +31,7 @@ macosx64-gn: fetches: toolchain: - linux64-cctools-port-clang-13 - - linux64-clang-13 + - linux64-clang-toolchain - macosx64-sdk-11.0 win32-gn: diff --git a/taskcluster/ci/toolchain/grcov.yml b/taskcluster/ci/toolchain/grcov.yml index 3e8ee8a34761..806990f80333 100644 --- a/taskcluster/ci/toolchain/grcov.yml +++ b/taskcluster/ci/toolchain/grcov.yml @@ -20,7 +20,7 @@ linux64-grcov: fetches: toolchain: - linux64-rust-1.57 - - linux64-clang + - linux64-clang-toolchain - linux64-binutils - sysroot-x86_64-linux-gnu diff --git a/taskcluster/ci/toolchain/llvm-symbolizer.yml b/taskcluster/ci/toolchain/llvm-symbolizer.yml index 06ff30390694..d646e1c1f1dc 100644 --- a/taskcluster/ci/toolchain/llvm-symbolizer.yml +++ b/taskcluster/ci/toolchain/llvm-symbolizer.yml @@ -16,7 +16,7 @@ linux64-llvm-symbolizer: symbol: TL(llvm-symbolizer) fetches: toolchain: - - linux64-clang + - linux64-clang-toolchain macosx64-llvm-symbolizer: description: "llvm-symbolizer for Linux" @@ -24,7 +24,7 @@ macosx64-llvm-symbolizer: symbol: TM(llvm-symbolizer) fetches: toolchain: - - macosx64-clang + - macosx64-clang-toolchain win64-llvm-symbolizer: description: "llvm-symbolizer for Linux" @@ -32,4 +32,4 @@ win64-llvm-symbolizer: symbol: TW64(llvm-symbolizer) fetches: toolchain: - - win64-clang + - win64-clang-toolchain diff --git a/taskcluster/ci/toolchain/minidump_stackwalk.yml b/taskcluster/ci/toolchain/minidump_stackwalk.yml index 3804d44ae24a..88f28b7f802e 100644 --- a/taskcluster/ci/toolchain/minidump_stackwalk.yml +++ b/taskcluster/ci/toolchain/minidump_stackwalk.yml @@ -26,7 +26,7 @@ linux64-minidump-stackwalk: fetches: toolchain: - linux64-binutils - - linux64-clang-13 + - linux64-clang-toolchain - linux64-rust-1.57 - sysroot-x86_64-linux-gnu @@ -38,7 +38,7 @@ macosx64-minidump-stackwalk: fetches: toolchain: - linux64-rust-macos-1.57 - - linux64-clang-13 + - linux64-clang-toolchain - linux64-cctools-port-clang-13 - macosx64-sdk-11.0 @@ -50,7 +50,7 @@ macosx64-aarch64-minidump-stackwalk: fetches: toolchain: - linux64-rust-macos-1.57 - - linux64-clang-13 + - linux64-clang-toolchain - linux64-cctools-port-clang-13 - macosx64-sdk-11.0 @@ -67,7 +67,7 @@ win32-minidump-stackwalk: tooltool-downloads: internal fetches: toolchain: - - linux64-clang-13 + - linux64-clang-toolchain - linux64-liblowercase - linux64-rust-windows-1.57 @@ -84,7 +84,7 @@ win64-minidump-stackwalk: tooltool-downloads: internal fetches: toolchain: - - linux64-clang-13 + - linux64-clang-toolchain - linux64-liblowercase - linux64-rust-windows-1.57 @@ -107,6 +107,6 @@ linux64-breakpad-injector: symbol: TL(injector) fetches: toolchain: - - linux64-clang-13 + - linux64-clang-toolchain - linux64-binutils - linux64-toolchain-sysroot diff --git a/taskcluster/ci/toolchain/misc.yml b/taskcluster/ci/toolchain/misc.yml index 29b3389bcd0a..67d668b13119 100644 --- a/taskcluster/ci/toolchain/misc.yml +++ b/taskcluster/ci/toolchain/misc.yml @@ -52,7 +52,7 @@ linux64-hfsplus: fetch: - hfsplus-tools toolchain: - - linux64-clang-13 + - linux64-clang-toolchain linux64-libdmg: description: "libdmg-hfsplus toolchain build" @@ -65,7 +65,7 @@ linux64-libdmg: fetch: - libdmg-hfsplus toolchain: - - linux64-clang-13 + - linux64-clang-toolchain - linux64-toolchain-sysroot linux64-mar-tools: @@ -74,7 +74,7 @@ linux64-mar-tools: symbol: TL(mar-tools) fetches: toolchain: - - linux64-clang-13 + - linux64-clang-toolchain - linux64-binutils run: script: build-mar-tools.sh @@ -110,7 +110,7 @@ linux64-msix-packaging: fetch: - msix-packaging toolchain: - - linux64-clang + - linux64-clang-toolchain - linux64-toolchain-sysroot linux64-custom-v8: @@ -261,7 +261,7 @@ win64-winchecksec: fetch: - winchecksec toolchain: - - linux64-clang-win-cross + - linux64-clang-toolchain - linux64-liblowercase linux64-makecab: @@ -311,5 +311,5 @@ nsis: - nsis-3.07 - nsis-3.07-win toolchain: - - linux64-clang-13 + - linux64-clang-toolchain - sysroot-x86_64-linux-gnu diff --git a/taskcluster/ci/toolchain/nasm.yml b/taskcluster/ci/toolchain/nasm.yml index 50fb9e0890b4..37c657e90105 100644 --- a/taskcluster/ci/toolchain/nasm.yml +++ b/taskcluster/ci/toolchain/nasm.yml @@ -39,7 +39,7 @@ macosx64-nasm: - nasm-2.15.05 toolchain: - linux64-cctools-port-clang-13 - - linux64-clang-13-macosx-cross + - linux64-clang-toolchain - macosx64-sdk-11.0 macosx64-aarch64-nasm: @@ -56,7 +56,7 @@ macosx64-aarch64-nasm: - nasm-2.14.02 toolchain: - linux64-cctools-port-clang-13 - - linux64-clang-13-macosx-cross + - linux64-clang-toolchain - macosx64-sdk-11.0 linux64-nasm: @@ -72,7 +72,7 @@ linux64-nasm: fetch: - nasm-2.15.05 toolchain: - - linux64-clang-13 + - linux64-clang-toolchain - sysroot-x86_64-linux-gnu linux64-nasm-2.14.02: @@ -86,5 +86,5 @@ linux64-nasm-2.14.02: fetch: - nasm-2.14.02 toolchain: - - linux64-clang-13 + - linux64-clang-toolchain - sysroot-x86_64-linux-gnu diff --git a/taskcluster/ci/toolchain/pkgconf.yml b/taskcluster/ci/toolchain/pkgconf.yml index f75e16ba8dbb..a19acf520b56 100644 --- a/taskcluster/ci/toolchain/pkgconf.yml +++ b/taskcluster/ci/toolchain/pkgconf.yml @@ -24,7 +24,7 @@ linux64-pkgconf: arguments: ['x86_64-unknown-linux-gnu'] fetches: toolchain: - - linux64-clang-13 + - linux64-clang-toolchain - sysroot-x86_64-linux-gnu macosx64-pkgconf: @@ -34,7 +34,7 @@ macosx64-pkgconf: arguments: ['x86_64-apple-darwin'] fetches: toolchain: - - linux64-clang-13 + - linux64-clang-toolchain - linux64-cctools-port-clang-13 - macosx64-sdk-11.0 @@ -45,7 +45,7 @@ macosx64-aarch64-pkgconf: arguments: ['aarch64-apple-darwin'] fetches: toolchain: - - linux64-clang-13 + - linux64-clang-toolchain - linux64-cctools-port-clang-13 - macosx64-sdk-11.0 diff --git a/taskcluster/ci/toolchain/rust.yml b/taskcluster/ci/toolchain/rust.yml index 326d047346e9..b47eb78e791a 100644 --- a/taskcluster/ci/toolchain/rust.yml +++ b/taskcluster/ci/toolchain/rust.yml @@ -26,7 +26,7 @@ linux64-rust-1.47: ] fetches: toolchain: - - linux64-clang + - linux64-clang-toolchain linux64-rust-1.57: treeherder: @@ -43,7 +43,7 @@ linux64-rust-1.57: ] fetches: toolchain: - - linux64-clang + - linux64-clang-toolchain linux64-rust-1.58: treeherder: @@ -61,7 +61,7 @@ linux64-rust-1.58: toolchain-alias: linux64-rust fetches: toolchain: - - linux64-clang + - linux64-clang-toolchain # A patched rust toolchain that allows us to use sanitizers in our vendored # build environment. See the rust fetch's comments for more details. @@ -83,7 +83,7 @@ linux64-rust-dev: fetch: - rust-1.59.0-dev toolchain: - - linux64-clang + - linux64-clang-toolchain - linux64-binutils @@ -171,7 +171,7 @@ linux64-rust-android-1.58: toolchain-alias: linux64-rust-android fetches: toolchain: - - linux64-clang + - linux64-clang-toolchain linux64-rust-windows-1.57: description: "rust repack with windows-cross support" diff --git a/taskcluster/ci/toolchain/sccache.yml b/taskcluster/ci/toolchain/sccache.yml index ff46cd3a1e54..5036c507ab98 100644 --- a/taskcluster/ci/toolchain/sccache.yml +++ b/taskcluster/ci/toolchain/sccache.yml @@ -27,7 +27,7 @@ linux64-sccache: fetches: toolchain: - linux64-rust-1.57 - - linux64-clang-13 + - linux64-clang-toolchain - linux64-binutils - sysroot-x86_64-linux-gnu @@ -43,7 +43,7 @@ macosx64-sccache: fetches: toolchain: - linux64-rust-macos-1.57 - - linux64-clang-13 + - linux64-clang-toolchain - linux64-cctools-port-clang-13 - macosx64-sdk-11.0 @@ -59,7 +59,7 @@ macosx64-aarch64-sccache: fetches: toolchain: - linux64-rust-macos-1.57 - - linux64-clang-13 + - linux64-clang-toolchain - linux64-cctools-port-clang-13 - macosx64-sdk-11.0