Skip to content

Commit 9451cde

Browse files
committed
ci: switch to jakoch/install-vulkan-sdk-action@v1 for Vulkan SDK + SwiftShader.
1 parent 8162296 commit 9451cde

File tree

1 file changed

+46
-10
lines changed

1 file changed

+46
-10
lines changed

.github/workflows/ci.yaml

Lines changed: 46 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,16 @@ jobs:
2525
steps:
2626
- uses: actions/checkout@v4
2727
- name: Install Vulkan SDK
28-
uses: humbletim/install-vulkan-sdk@v1.2
28+
uses: jakoch/install-vulkan-sdk-action@v1
2929
with:
30-
version: 1.4.309.0
30+
vulkan_version: 1.4.309.0
31+
install_runtime: true
3132
cache: true
33+
stripdown: true
34+
35+
# FIXME(eddyb) consider using lavapipe instead, or even trying both.
36+
install_swiftshader: true
37+
# install_lavapipe: true
3238
- if: ${{ runner.os == 'Linux' }}
3339
name: Linux - Install native dependencies
3440
run: sudo apt install libwayland-cursor0 libxkbcommon-dev libwayland-dev
@@ -84,10 +90,16 @@ jobs:
8490
steps:
8591
- uses: actions/checkout@v4
8692
- name: Install Vulkan SDK
87-
uses: humbletim/install-vulkan-sdk@v1.2
93+
uses: jakoch/install-vulkan-sdk-action@v1
8894
with:
89-
version: 1.4.309.0
95+
vulkan_version: 1.4.309.0
96+
install_runtime: true
9097
cache: true
98+
stripdown: true
99+
100+
# FIXME(eddyb) consider using lavapipe instead, or even trying both.
101+
install_swiftshader: true
102+
# install_lavapipe: true
91103
- name: install rust-toolchain
92104
run: cargo version
93105
- name: cargo fetch --locked
@@ -125,10 +137,16 @@ jobs:
125137
steps:
126138
- uses: actions/checkout@v4
127139
- name: Install Vulkan SDK
128-
uses: humbletim/install-vulkan-sdk@v1.2
140+
uses: jakoch/install-vulkan-sdk-action@v1
129141
with:
130-
version: 1.4.309.0
142+
vulkan_version: 1.4.309.0
143+
install_runtime: true
131144
cache: true
145+
stripdown: true
146+
147+
# FIXME(eddyb) consider using lavapipe instead, or even trying both.
148+
install_swiftshader: true
149+
# install_lavapipe: true
132150
- name: install rust-toolchain
133151
run: echo "TARGET=$(rustc --print host-tuple)" >> "$GITHUB_ENV"
134152
- name: cargo fetch --locked
@@ -145,10 +163,22 @@ jobs:
145163
steps:
146164
- uses: actions/checkout@v4
147165
- name: Install Vulkan SDK
148-
uses: humbletim/install-vulkan-sdk@v1.2
166+
uses: jakoch/install-vulkan-sdk-action@v1
149167
with:
150-
version: 1.4.309.0
168+
vulkan_version: 1.4.309.0
169+
install_runtime: true
151170
cache: true
171+
stripdown: true
172+
173+
# FIXME(eddyb) consider using lavapipe instead, or even trying both.
174+
install_swiftshader: true
175+
# install_lavapipe: true
176+
- if: ${{ runner.os == 'Windows' }}
177+
name: Windows - Use SwiftShader as Vulkan driver
178+
# FIXME(eddyb) ideally `jakoch/install-vulkan-sdk-action` should do this.
179+
run: |
180+
echo "C:/Swiftshader/" >> "$GITHUB_PATH"
181+
echo "VK_DRIVER_FILES=C:/Swiftshader/vk_swiftshader_icd.json" >> "$GITHUB_ENV"
152182
- if: ${{ runner.os == 'Linux' }}
153183
name: Linux - Install native dependencies
154184
run: sudo apt install libwayland-cursor0 libxkbcommon-dev libwayland-dev
@@ -199,10 +229,16 @@ jobs:
199229
- name: Install native dependencies
200230
run: sudo apt install libwayland-cursor0 libxkbcommon-dev libwayland-dev
201231
- name: Install Vulkan SDK
202-
uses: humbletim/install-vulkan-sdk@v1.2
232+
uses: jakoch/install-vulkan-sdk-action@v1
203233
with:
204-
version: 1.4.309.0
234+
vulkan_version: 1.4.309.0
235+
install_runtime: true
205236
cache: true
237+
stripdown: true
238+
239+
# FIXME(eddyb) consider using lavapipe instead, or even trying both.
240+
install_swiftshader: true
241+
# install_lavapipe: true
206242
- name: Install rustup components
207243
run: rustup component add rustfmt clippy
208244
# cargo version is a random command that forces the installation of rust-toolchain

0 commit comments

Comments
 (0)