Skip to content

Commit 50430da

Browse files
committed
Add SKU
1 parent 2f6610a commit 50430da

7 files changed

+28
-2
lines changed

.github/workflows/macos-dxc-mtl.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@ jobs:
1313
uses: ./.github/workflows/test-all.yaml
1414
with:
1515
OS: macOS
16+
SKU: macOS
1617
Test-Clang: Off
1718
TestTarget: check-hlsl-mtl

.github/workflows/test-all.yaml

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ on:
1717
required: false
1818
default: 'main'
1919
type: string
20+
LLVM-fork:
21+
description: 'LLVM fork'
22+
required: false
23+
default: 'llvm'
24+
type: string
2025
DXC-branch:
2126
description: 'DXC Branch'
2227
required: false
@@ -47,6 +52,13 @@ on:
4752
options:
4853
- macOS
4954
- windows
55+
SKU:
56+
required: true
57+
type: choice
58+
options:
59+
- macOS
60+
- GPU-Intel
61+
- GPU-NV
5062
workflow_call:
5163
inputs:
5264
HLSLTest-branch:
@@ -59,6 +71,11 @@ on:
5971
required: false
6072
default: 'main'
6173
type: string
74+
LLVM-fork:
75+
description: 'LLVM For'
76+
required: false
77+
default: 'llvm'
78+
type: string
6279
DXC-branch:
6380
description: 'DXC Branch'
6481
required: false
@@ -67,6 +84,9 @@ on:
6784
OS:
6885
required: true
6986
type: string
87+
SKU:
88+
required: true
89+
type: string
7090
BuildType:
7191
description: 'DXC Branch'
7292
required: false
@@ -83,7 +103,7 @@ on:
83103

84104
jobs:
85105
build:
86-
runs-on: [self-hosted, "${{ inputs.OS }}"]
106+
runs-on: [self-hosted, "${{ inputs.SKU }}"]
87107
steps:
88108
- name: Checkout DXC
89109
uses: actions/checkout@v4
@@ -96,7 +116,7 @@ jobs:
96116
- name: Checkout LLVM
97117
uses: actions/checkout@v4
98118
with:
99-
repository: llvm/llvm-project
119+
repository: ${{ inputs.LLVM-fork }}/llvm-project
100120
ref: ${{ inputs.LLVM-branch }}
101121
path: llvm-project
102122
fetch-depth: 1

.github/workflows/windows-intel-clang-vk.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@ jobs:
1313
uses: ./.github/workflows/test-all.yaml
1414
with:
1515
OS: windows
16+
SKU: GPU-Intel
1617
Test-Clang: On
1718
TestTarget: check-hlsl-clang-vk

.github/workflows/windows-intel-clang-warp-d3d12.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@ jobs:
1313
uses: ./.github/workflows/test-all.yaml
1414
with:
1515
OS: windows
16+
SKU: GPU-Intel
1617
Test-Clang: On
1718
TestTarget: check-hlsl-clang-warp-d3d12

.github/workflows/windows-intel-dxc-d3d12.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ jobs:
1313
uses: ./.github/workflows/test-all.yaml
1414
with:
1515
OS: windows
16+
SKU: GPU-Intel
1617
Test-Clang: Off
1718
BuildType: Debug
1819
TestTarget: check-hlsl-d3d12

.github/workflows/windows-intel-dxc-vk.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ jobs:
1313
uses: ./.github/workflows/test-all.yaml
1414
with:
1515
OS: windows
16+
SKU: GPU-Intel
1617
Test-Clang: Off
1718
BuildType: Debug
1819
TestTarget: check-hlsl-vk

.github/workflows/windows-intel-dxc-warp-d3d12.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ jobs:
1313
uses: ./.github/workflows/test-all.yaml
1414
with:
1515
OS: windows
16+
SKU: GPU-Intel
1617
Test-Clang: Off
1718
BuildType: Debug
1819
TestTarget: check-hlsl-warp-d3d12

0 commit comments

Comments
 (0)