Skip to content

Commit 0ea66b0

Browse files
committed
Use swiftshader on windows
1 parent 1d5c7c9 commit 0ea66b0

File tree

2 files changed

+30
-12
lines changed
  • .github/workflows
  • tests/difftests/tests/arch/workgroup_memory/workgroup_memory-ash/src

2 files changed

+30
-12
lines changed

.github/workflows/ci.yaml

Lines changed: 28 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,13 @@ jobs:
2424
RUSTUP_IO_THREADS: "1"
2525
steps:
2626
- uses: actions/checkout@v4
27-
- name: Install Vulkan SDK
27+
- if: ${{ runner.os == 'Windows' }}
28+
name: Install Vulkan SDK with SwiftShader (Windows)
29+
uses: NcStudios/[email protected]
30+
with:
31+
sdkVersion: 1.4.309.0
32+
- if: ${{ runner.os != 'Windows' }}
33+
name: Install Vulkan SDK
2834
uses: humbletim/[email protected]
2935
with:
3036
version: 1.4.309.0
@@ -83,7 +89,13 @@ jobs:
8389
RUSTUP_IO_THREADS: "1"
8490
steps:
8591
- uses: actions/checkout@v4
86-
- name: Install Vulkan SDK
92+
- if: ${{ runner.os == 'Windows' }}
93+
name: Install Vulkan SDK with SwiftShader (Windows)
94+
uses: NcStudios/[email protected]
95+
with:
96+
sdkVersion: 1.4.309.0
97+
- if: ${{ runner.os != 'Windows' }}
98+
name: Install Vulkan SDK
8799
uses: humbletim/[email protected]
88100
with:
89101
version: 1.4.309.0
@@ -124,7 +136,13 @@ jobs:
124136
runs-on: ${{ matrix.os }}
125137
steps:
126138
- uses: actions/checkout@v4
127-
- name: Install Vulkan SDK
139+
- if: ${{ runner.os == 'Windows' }}
140+
name: Install Vulkan SDK with SwiftShader (Windows)
141+
uses: NcStudios/[email protected]
142+
with:
143+
sdkVersion: 1.4.309.0
144+
- if: ${{ runner.os != 'Windows' }}
145+
name: Install Vulkan SDK
128146
uses: humbletim/[email protected]
129147
with:
130148
version: 1.4.309.0
@@ -144,16 +162,17 @@ jobs:
144162
runs-on: ${{ matrix.os }}
145163
steps:
146164
- uses: actions/checkout@v4
147-
- name: Install Vulkan SDK
165+
- if: ${{ runner.os == 'Windows' }}
166+
name: Install Vulkan SDK with SwiftShader (Windows)
167+
uses: NcStudios/[email protected]
168+
with:
169+
sdkVersion: 1.4.309.0
170+
- if: ${{ runner.os != 'Windows' }}
171+
name: Install Vulkan SDK
148172
uses: humbletim/[email protected]
149173
with:
150174
version: 1.4.309.0
151175
cache: true
152-
- if: ${{ runner.os == 'Windows' }}
153-
name: Windows - Setup Vulkan Runtime
154-
run: |
155-
echo "VK_LAYER_PATH=$VULKAN_SDK/Bin" >> "$GITHUB_ENV"
156-
echo "$VULKAN_SDK/Bin" >> "$GITHUB_PATH"
157176
- if: ${{ runner.os == 'Linux' }}
158177
name: Linux - Install native dependencies
159178
run: sudo apt install libwayland-cursor0 libxkbcommon-dev libwayland-dev

tests/difftests/tests/arch/workgroup_memory/workgroup_memory-ash/src/main.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ fn main() {
88
#[cfg(target_os = "macos")]
99
{
1010
use difftest::scaffold::Skip;
11-
12-
let skip =
13-
Skip::new("Ash tests are skipped on macOS due to MoltenVK configuration issues");
11+
12+
let skip = Skip::new("Ash tests are skipped on macOS due to MoltenVK configuration issues");
1413
skip.run_test(&config).unwrap();
1514
return;
1615
}

0 commit comments

Comments
 (0)