Skip to content

Commit c8fce72

Browse files
committed
Workflow cleanup based on feedback from @tstellar
1 parent a8b3089 commit c8fce72

File tree

2 files changed

+3
-24
lines changed

2 files changed

+3
-24
lines changed

.github/workflows/hlsl-macos.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ name: HLSL Tests - macOS
22

33
permissions:
44
contents: read
5-
checks: write
65

76
on:
87
workflow_dispatch:
@@ -20,7 +19,6 @@ jobs:
2019
HLSL-macOS:
2120
uses: ./.github/workflows/hlsl-test-all.yaml
2221
with:
23-
OS: macOS
2422
SKU: hlsl-macos
2523
TestTarget: check-hlsl-clang-mtl
2624
LLVM-branch: ${{ github.ref }}

.github/workflows/hlsl-test-all.yaml

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@ 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
2520
DXC-branch:
2621
description: 'DXC Branch'
2722
required: false
@@ -46,12 +41,6 @@ on:
4641
options:
4742
- On
4843
- Off
49-
OS:
50-
required: true
51-
type: choice
52-
options:
53-
- macOS
54-
- windows
5544
SKU:
5645
required: true
5746
type: choice
@@ -74,19 +63,11 @@ on:
7463
required: false
7564
default: 'main'
7665
type: string
77-
LLVM-fork:
78-
description: 'LLVM Fork'
79-
required: false
80-
default: 'llvm'
81-
type: string
8266
DXC-branch:
8367
description: 'DXC Branch'
8468
required: false
8569
default: 'main'
8670
type: string
87-
OS:
88-
required: true
89-
type: string
9071
SKU:
9172
required: true
9273
type: string
@@ -124,7 +105,7 @@ jobs:
124105
- name: Checkout LLVM
125106
uses: actions/checkout@v4
126107
with:
127-
repository: ${{ inputs.LLVM-fork }}/llvm-project
108+
repository: llvm/llvm-project
128109
ref: ${{ inputs.LLVM-branch }}
129110
path: llvm-project
130111
fetch-depth: 1
@@ -143,7 +124,7 @@ jobs:
143124
path: golden-images
144125
fetch-depth: 1
145126
- name: Setup Windows
146-
if: inputs.OS == 'windows'
127+
if: runner.os == 'windows'
147128
uses: llvm/actions/setup-windows@main
148129
with:
149130
arch: amd64
@@ -171,7 +152,7 @@ jobs:
171152
ninja ${{ inputs.TestTarget }}
172153
- name: Publish Test Results
173154
uses: EnricoMi/publish-unit-test-result-action/macos@v2
174-
if: always() && inputs.OS == 'macOS'
155+
if: always() && runner.os == 'macOS'
175156
with:
176157
comment_mode: off
177158
files: llvm-project/build/**/testresults.xunit.xml

0 commit comments

Comments
 (0)