Skip to content

Commit fbca720

Browse files
committed
Fix NUKE execution matrix workflow error
1 parent 4a4aa48 commit fbca720

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

.github/workflows/swiftshader.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,16 @@ jobs:
2020
env:
2121
- os: ubuntu-22.04
2222
name: Linux x64
23-
nuke_invoke: ./build.sh --matrix-arg linux-x64
23+
nuke_invoke: ./build.sh
24+
nuke_extra: --matrix-arg linux-x64
2425
- os: ubuntu-22.04
2526
name: Linux ARM32
26-
nuke_invoke: ./build.sh --matrix-arg linux-arm
27+
nuke_invoke: ./build.sh
28+
nuke_extra: --matrix-arg linux-arm
2729
- os: ubuntu-22.04
2830
name: Linux ARM64
29-
nuke_invoke: ./build.sh --matrix-arg linux-arm64
31+
nuke_invoke: ./build.sh
32+
nuke_extra: --matrix-arg linux-arm64
3033
- os: windows-2022
3134
name: Windows
3235
nuke_invoke: ./build.cmd
@@ -64,9 +67,9 @@ jobs:
6467
6.0.201
6568
7.0.*
6669
- name: Install Zig
67-
if: ${{ matrix.env.name == 'Linux' }}
70+
if: ${{ matrix.env.os == 'ubuntu-22.04' }}
6871
uses: goto-bus-stop/setup-zig@v2
6972
- name: Build SwiftShader
70-
run: ${{ matrix.env.nuke_invoke }} SwiftShader
73+
run: ${{ matrix.env.nuke_invoke }} SwiftShader ${{ matrix.env.nuke_extra }}
7174
env:
7275
PUSHABLE_GITHUB_TOKEN: ${{ secrets.PUSHABLE_GITHUB_TOKEN }}

.nuke/build.schema.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@
6767
"VSCode"
6868
]
6969
},
70+
"MatrixArg": {
71+
"type": "string",
72+
"description": "Matrix job argument e.g. a RID for native builds"
73+
},
7074
"MsbuildProperties": {
7175
"type": "array",
7276
"description": "Extra properties passed to MSBuild commands",

0 commit comments

Comments
 (0)