Skip to content

Commit bf5f5f2

Browse files
committed
Add PR merge checks
Hopefully this works...
1 parent 826a23a commit bf5f5f2

File tree

4 files changed

+55
-0
lines changed

4 files changed

+55
-0
lines changed

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,22 @@ on:
88
schedule:
99
- cron: '*/30 * * * *' # run every 30 minutes
1010

11+
pull_request:
12+
branches:
13+
- main
14+
1115
jobs:
16+
macOS-Metal-DXC-PR:
17+
if: ${{ github.event.issue.pull_request }}
18+
uses: ./.github/workflows/test-all.yaml
19+
with:
20+
OS: macOS
21+
SKU: macOS
22+
Test-Clang: Off
23+
TestTarget: check-hlsl-mtl
24+
HLSLTest-branch: ${{ github.event.pull_request.head.sha }}
1225
macOS-Metal-DXC:
26+
if: ${{ !github.event.issue.pull_request }}
1327
uses: ./.github/workflows/test-all.yaml
1428
with:
1529
OS: macOS

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,23 @@ on:
88
schedule:
99
- cron: '*/30 * * * *' # run every 30 minutes
1010

11+
pull_request:
12+
branches:
13+
- main
14+
1115
jobs:
16+
Windows-D3D12-Intel-DXC-PR:
17+
if: ${{ github.event.issue.pull_request }}
18+
uses: ./.github/workflows/test-all.yaml
19+
with:
20+
OS: windows
21+
SKU: GPU-Intel
22+
Test-Clang: Off
23+
BuildType: Debug
24+
TestTarget: check-hlsl-d3d12
25+
HLSLTest-branch: ${{ github.event.pull_request.head.sha }}
1226
Windows-D3D12-Intel-DXC:
27+
if: ${{ !github.event.issue.pull_request }}
1328
uses: ./.github/workflows/test-all.yaml
1429
with:
1530
OS: windows

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,23 @@ on:
88
schedule:
99
- cron: '*/30 * * * *' # run every 30 minutes
1010

11+
pull_request:
12+
branches:
13+
- main
14+
1115
jobs:
16+
Windows-VK-Intel-DXC-PR:
17+
if: ${{ github.event.issue.pull_request }}
18+
uses: ./.github/workflows/test-all.yaml
19+
with:
20+
OS: windows
21+
SKU: GPU-Intel
22+
Test-Clang: Off
23+
BuildType: Debug
24+
TestTarget: check-hlsl-vk
25+
HLSLTest-branch: ${{ github.event.pull_request.head.sha }}
1226
Windows-VK-Intel-DXC:
27+
if: ${{ !github.event.issue.pull_request }}
1328
uses: ./.github/workflows/test-all.yaml
1429
with:
1530
OS: windows

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,18 @@ on:
99
- cron: '*/30 * * * *' # run every 30 minutes
1010

1111
jobs:
12+
Windows-D3D12-Warp-DXC-PR:
13+
if: ${{ github.event.issue.pull_request }}
14+
uses: ./.github/workflows/test-all.yaml
15+
with:
16+
OS: windows
17+
SKU: GPU-Intel
18+
Test-Clang: Off
19+
BuildType: Debug
20+
TestTarget: check-hlsl-warp-d3d12
21+
HLSLTest-branch: ${{ github.event.pull_request.head.sha }}
1222
Windows-D3D12-Warp-DXC:
23+
if: ${{ !github.event.issue.pull_request }}
1324
uses: ./.github/workflows/test-all.yaml
1425
with:
1526
OS: windows

0 commit comments

Comments
 (0)