commit bc5c15772d82d9128d014854198f0486268fe8d4
parent ec7e44779f6f54e74f3392edcfab4863875d9d2f
Author: Cristina Horotan <chorotan@mozilla.com>
Date: Fri, 3 Oct 2025 21:36:05 +0300
Revert "Bug 1989099 - refactor(dxc): factor out common elements of `toolchain-dxc` jobs r=webgpu-reviewers,nical" for causing Bugzilla failures
This reverts commit 02175cb637f8a161919119468940c3531c9b6803.
Revert "Bug 1989099 - chore(dxc): move DXC-building tasks to `toolchain/dxc.yml` r=webgpu-reviewers,nical"
This reverts commit 9add085fed69608dc7d7701161d43ca13d9081ab.
Diffstat:
5 files changed, 59 insertions(+), 54 deletions(-)
diff --git a/mots.yaml b/mots.yaml
@@ -8,7 +8,7 @@
# documentation and how to modify this file.
repo: mozilla-central
created_at: '2021-10-14T12:50:40.073465'
-updated_at: '2025-10-03T16:08:47.342777+00:00'
+updated_at: '2025-10-01T15:21:04.336313+00:00'
export:
path: ./docs/mots/index.rst
format: rst
@@ -3017,7 +3017,6 @@ modules:
- dom/webgpu/**/*
- gfx/wgpu_bindings/**/*
- taskcluster/kinds/toolchain-dxc-upload/kind.yml
- - taskcluster/kinds/toolchain/dxc.yml
- third_party/rust/naga/**/*
- third_party/rust/wgpu-*/**/*
- testing/web-platform/tests/webgpu/**/*
@@ -4627,5 +4626,5 @@ modules:
- Ryan Tilder
group: dev-platform
hashes:
- config: e72ed229dd90927fbb8c7e8926f4a730351c990e
- export: 22599ae6b8b0282ee14abeb998de1ff83c38c685
+ config: 59f8d9db52cfab7a7f8df28d3c9619871dab8767
+ export: 5960043482fc6dcabb1e2d619ccfe53e6919a173
diff --git a/taskcluster/kinds/toolchain/dxc.yml b/taskcluster/kinds/toolchain/dxc.yml
@@ -1,46 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
----
-task-defaults:
- attributes:
- dxc-crash-symbols: true
- enable-full-crashsymbols: true
- local-toolchain: true
- fetches:
- toolchain:
- - linux64-clang-toolchain
- - linux64-dump_syms
- - linux64-makecab
- - vs-toolchain
- fetch:
- - dxc-src
- run:
- script: build-dxc.sh
- sparse-profile: null
- worker-type: b-linux-amd
- worker:
- env:
- MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE: system
- MAKECAB: /builds/worker/fetches/makecab/makecab
- max-run-time: 1800
-
-win64-dxc:
- description: "DirectX Shader Compiler (x86_64)"
- treeherder:
- symbol: TW64(dxc)
- run:
- arguments:
- - "x86_64"
- toolchain-artifact: public/build/dxc-x86_64-pc-windows-msvc.tar.zst
- toolchain-alias: dxc-x86_64-pc-windows-msvc
-
-win64-aarch64-dxc:
- description: "DirectX Shader Compiler (aarch64)"
- treeherder:
- symbol: TWA64(dxc)
- run:
- arguments:
- - "aarch64"
- toolchain-artifact: public/build/dxc-aarch64-pc-windows-msvc.tar.zst
- toolchain-alias: dxc-aarch64-pc-windows-msvc
diff --git a/taskcluster/kinds/toolchain/kind.yml b/taskcluster/kinds/toolchain/kind.yml
@@ -32,7 +32,6 @@ tasks-from:
- clang-tidy.yml
- clang.yml
- compiler-rt.yml
- - dxc.yml
- dump-syms.yml
- fix-stacks.yml
- gcc.yml
diff --git a/taskcluster/kinds/toolchain/misc.yml b/taskcluster/kinds/toolchain/misc.yml
@@ -792,6 +792,62 @@ talos-pdfs:
fetch:
- mozilla-pdf.js
+win64-dxc:
+ description: "DirectX Shader Compiler (x86_64)"
+ attributes:
+ dxc-crash-symbols: true
+ enable-full-crashsymbols: true
+ local-toolchain: true
+ treeherder:
+ symbol: TW64(dxc)
+ worker:
+ env:
+ MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE: system
+ MAKECAB: /builds/worker/fetches/makecab/makecab
+ run:
+ script: build-dxc.sh
+ sparse-profile: null
+ arguments:
+ - "x86_64"
+ toolchain-artifact: public/build/dxc-x86_64-pc-windows-msvc.tar.zst
+ toolchain-alias: dxc-x86_64-pc-windows-msvc
+ fetches:
+ toolchain:
+ - linux64-clang-toolchain
+ - linux64-dump_syms
+ - linux64-makecab
+ - vs-toolchain
+ fetch:
+ - dxc-src
+
+win64-aarch64-dxc:
+ description: "DirectX Shader Compiler (aarch64)"
+ attributes:
+ dxc-crash-symbols: true
+ enable-full-crashsymbols: true
+ local-toolchain: true
+ treeherder:
+ symbol: TWA64(dxc)
+ worker:
+ env:
+ MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE: system
+ MAKECAB: /builds/worker/fetches/makecab/makecab
+ run:
+ script: build-dxc.sh
+ sparse-profile: null
+ arguments:
+ - "aarch64"
+ toolchain-artifact: public/build/dxc-aarch64-pc-windows-msvc.tar.zst
+ toolchain-alias: dxc-aarch64-pc-windows-msvc
+ fetches:
+ toolchain:
+ - linux64-clang-toolchain
+ - linux64-dump_syms
+ - linux64-makecab
+ - vs-toolchain
+ fetch:
+ - dxc-src
+
symbolicator-cli:
description: "symbolicator-cli from firefox profiler"
treeherder:
diff --git a/uv.lock b/uv.lock
@@ -1,3 +0,0 @@
-version = 1
-revision = 3
-requires-python = ">=3.12"
