Skip to content

Commit e73af41

Browse files
committed
Install tools on windows too
1 parent 49f8fa7 commit e73af41

File tree

1 file changed

+24
-28
lines changed

1 file changed

+24
-28
lines changed

.github/workflows/ci.yaml

Lines changed: 24 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,16 @@ jobs:
2424
RUSTUP_IO_THREADS: "1"
2525
steps:
2626
- uses: actions/checkout@v4
27-
- if: ${{ runner.os == 'Windows' }}
28-
name: Install Vulkan SDK with SwiftShader (Windows)
29-
uses: NcStudios/VulkanCI@v1.2
30-
with:
31-
sdkVersion: 1.4.309.0
32-
- if: ${{ runner.os != 'Windows' }}
33-
name: Install Vulkan SDK
27+
- name: Install Vulkan SDK
3428
uses: humbletim/install-vulkan-sdk@v1.2
3529
with:
3630
version: 1.4.309.0
3731
cache: true
32+
- if: ${{ runner.os == 'Windows' }}
33+
name: Install Vulkan Runtime with SwiftShader (Windows)
34+
uses: NcStudios/VulkanCI@v1.2
35+
with:
36+
sdkVersion: 1.4.309.0
3837
- if: ${{ runner.os == 'Linux' }}
3938
name: Linux - Install native dependencies
4039
run: sudo apt install libwayland-cursor0 libxkbcommon-dev libwayland-dev
@@ -89,17 +88,16 @@ jobs:
8988
RUSTUP_IO_THREADS: "1"
9089
steps:
9190
- uses: actions/checkout@v4
92-
- if: ${{ runner.os == 'Windows' }}
93-
name: Install Vulkan SDK with SwiftShader (Windows)
94-
uses: NcStudios/VulkanCI@v1.2
95-
with:
96-
sdkVersion: 1.4.309.0
97-
- if: ${{ runner.os != 'Windows' }}
98-
name: Install Vulkan SDK
91+
- name: Install Vulkan SDK
9992
uses: humbletim/install-vulkan-sdk@v1.2
10093
with:
10194
version: 1.4.309.0
10295
cache: true
96+
- if: ${{ runner.os == 'Windows' }}
97+
name: Install Vulkan Runtime with SwiftShader (Windows)
98+
uses: NcStudios/VulkanCI@v1.2
99+
with:
100+
sdkVersion: 1.4.309.0
103101
- name: install rust-toolchain
104102
run: cargo version
105103
- name: cargo fetch --locked
@@ -136,17 +134,16 @@ jobs:
136134
runs-on: ${{ matrix.os }}
137135
steps:
138136
- uses: actions/checkout@v4
139-
- if: ${{ runner.os == 'Windows' }}
140-
name: Install Vulkan SDK with SwiftShader (Windows)
141-
uses: NcStudios/VulkanCI@v1.2
142-
with:
143-
sdkVersion: 1.4.309.0
144-
- if: ${{ runner.os != 'Windows' }}
145-
name: Install Vulkan SDK
137+
- name: Install Vulkan SDK
146138
uses: humbletim/install-vulkan-sdk@v1.2
147139
with:
148140
version: 1.4.309.0
149141
cache: true
142+
- if: ${{ runner.os == 'Windows' }}
143+
name: Install Vulkan Runtime with SwiftShader (Windows)
144+
uses: NcStudios/VulkanCI@v1.2
145+
with:
146+
sdkVersion: 1.4.309.0
150147
- name: install rust-toolchain
151148
run: echo "TARGET=$(rustc --print host-tuple)" >> "$GITHUB_ENV"
152149
- name: cargo fetch --locked
@@ -162,17 +159,16 @@ jobs:
162159
runs-on: ${{ matrix.os }}
163160
steps:
164161
- uses: actions/checkout@v4
165-
- if: ${{ runner.os == 'Windows' }}
166-
name: Install Vulkan SDK with SwiftShader (Windows)
167-
uses: NcStudios/VulkanCI@v1.2
168-
with:
169-
sdkVersion: 1.4.309.0
170-
- if: ${{ runner.os != 'Windows' }}
171-
name: Install Vulkan SDK
162+
- name: Install Vulkan SDK
172163
uses: humbletim/install-vulkan-sdk@v1.2
173164
with:
174165
version: 1.4.309.0
175166
cache: true
167+
- if: ${{ runner.os == 'Windows' }}
168+
name: Install Vulkan Runtime with SwiftShader (Windows)
169+
uses: NcStudios/VulkanCI@v1.2
170+
with:
171+
sdkVersion: 1.4.309.0
176172
- if: ${{ runner.os == 'Linux' }}
177173
name: Linux - Install native dependencies
178174
run: sudo apt install libwayland-cursor0 libxkbcommon-dev libwayland-dev

0 commit comments

Comments
 (0)