Skip to content

Commit fbe8893

Browse files
committed
ci: replace spirv-tools prebuilds with vulkan sdk from lunarg
1 parent bd1a6fc commit fbe8893

File tree

3 files changed

+25
-143
lines changed

3 files changed

+25
-143
lines changed

.github/install-spirv-tools/Cargo.toml

Lines changed: 0 additions & 14 deletions
This file was deleted.

.github/install-spirv-tools/src/main.rs

Lines changed: 0 additions & 109 deletions
This file was deleted.

.github/workflows/ci.yaml

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,11 @@ jobs:
3030
RUSTUP_IO_THREADS: "1"
3131
steps:
3232
- uses: actions/checkout@v4
33-
# Install the spirv-tools binaries from tarballs hosted on each release
34-
# of spirv-tools. This downloads the tarball, decompresses it, unpacks
35-
# the binaries to the specified path, and adds them to PATH
36-
- name: Install spirv-tools binaries
37-
shell: bash
38-
run: cargo run --manifest-path .github/install-spirv-tools/Cargo.toml -- ${{matrix.host || matrix.target}} 0.10.0 "${{github.workspace}}/bin"
33+
- name: Install Vulkan SDK
34+
uses: humbletim/[email protected]
35+
with:
36+
version: 1.4.309.0
37+
cache: true
3938
- if: ${{ runner.os == 'Linux' }}
4039
name: Linux - Install native dependencies
4140
run: sudo apt install libwayland-cursor0 libxkbcommon-dev libwayland-dev
@@ -91,12 +90,11 @@ jobs:
9190
RUSTUP_IO_THREADS: "1"
9291
steps:
9392
- uses: actions/checkout@v4
94-
# Install the spirv-tools binaries from tarballs hosted on each release
95-
# of spirv-tools. This downloads the tarball, decompresses it, unpacks
96-
# the binaries to the specified path, and adds them to PATH
97-
- name: Install spirv-tools binaries
98-
shell: bash
99-
run: cargo run --manifest-path .github/install-spirv-tools/Cargo.toml -- ${{matrix.host || matrix.target}} 0.10.0 "${{github.workspace}}/bin"
93+
- name: Install Vulkan SDK
94+
uses: humbletim/[email protected]
95+
with:
96+
version: 1.4.309.0
97+
cache: true
10098
# cargo version is a random command that forces the installation of rust-toolchain
10199
- name: install rust-toolchain
102100
run: cargo version
@@ -142,9 +140,11 @@ jobs:
142140
runs-on: ${{ matrix.os }}
143141
steps:
144142
- uses: actions/checkout@v4
145-
- name: Install spirv-tools binaries
146-
shell: bash
147-
run: cargo run --manifest-path .github/install-spirv-tools/Cargo.toml -- ${{matrix.target}} 0.10.0 "${{github.workspace}}/bin"
143+
- name: Install Vulkan SDK
144+
uses: humbletim/[email protected]
145+
with:
146+
version: 1.4.309.0
147+
cache: true
148148
# cargo version is a random command that forces the installation of rust-toolchain
149149
- name: install rust-toolchain
150150
run: cargo version
@@ -167,9 +167,11 @@ jobs:
167167
runs-on: ${{ matrix.os }}
168168
steps:
169169
- uses: actions/checkout@v4
170-
- name: Install spirv-tools binaries
171-
shell: bash
172-
run: cargo run --manifest-path .github/install-spirv-tools/Cargo.toml -- ${{matrix.target}} 0.10.0 "${{github.workspace}}/bin"
170+
- name: Install Vulkan SDK
171+
uses: humbletim/[email protected]
172+
with:
173+
version: 1.4.309.0
174+
cache: true
173175
- if: ${{ runner.os == 'Linux' }}
174176
name: Linux - Install native dependencies
175177
run: sudo apt install libwayland-cursor0 libxkbcommon-dev libwayland-dev
@@ -212,8 +214,11 @@ jobs:
212214
submodules: "false"
213215
- name: Install native dependencies
214216
run: sudo apt install libwayland-cursor0 libxkbcommon-dev libwayland-dev
215-
- name: Install spirv-tools
216-
run: cargo run --manifest-path .github/install-spirv-tools/Cargo.toml -- x86_64-unknown-linux-gnu 0.10.0 "${{github.workspace}}/bin"
217+
- name: Install Vulkan SDK
218+
uses: humbletim/[email protected]
219+
with:
220+
version: 1.4.309.0
221+
cache: true
217222
- name: Install rustup components
218223
run: rustup component add rustfmt clippy
219224
# cargo version is a random command that forces the installation of rust-toolchain

0 commit comments

Comments
 (0)