Skip to content

Commit 44393af

Browse files
authored
Update spirv-tools to 0.5.0 (#496)
* Update spirv-tools to 0.5.0 * Use ubuntu-20.04 image rather than the ambiguous "latest" * Update spirv-tools binaries to latest
1 parent 1d36549 commit 44393af

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

.github/workflows/ci.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ jobs:
1212
strategy:
1313
matrix:
1414
include:
15-
- os: ubuntu-latest
15+
- os: ubuntu-20.04
1616
target: x86_64-unknown-linux-gnu
1717
- os: windows-latest
1818
target: x86_64-pc-windows-msvc
1919
- os: macOS-latest
2020
target: x86_64-apple-darwin
21-
- os: ubuntu-latest
21+
- os: ubuntu-20.04
2222
target: aarch64-linux-android
2323
runs-on: ${{ matrix.os }}
2424
env:
@@ -32,7 +32,7 @@ jobs:
3232
run: |
3333
sudo apt install libwayland-cursor0 libxkbcommon-dev libwayland-dev
3434
mkdir "${HOME}/spirv-tools"
35-
curl -fL https://storage.googleapis.com/spirv-tools/artifacts/prod/graphics_shader_compiler/spirv-tools/linux-clang-release/continuous/1305/20201026-063148/install.tgz | tar -xz -C "${HOME}/spirv-tools"
35+
curl -fL https://storage.googleapis.com/spirv-tools/artifacts/prod/graphics_shader_compiler/spirv-tools/linux-clang-release/continuous/1409/20210313-175801/install.tgz | tar -xz -C "${HOME}/spirv-tools"
3636
echo "${HOME}/spirv-tools/install/bin" >> $GITHUB_PATH
3737
- if: ${{ runner.os == 'macOS' }}
3838
name: Mac - Install spirv-tools
@@ -45,7 +45,7 @@ jobs:
4545
run: |
4646
tmparch=$(mktemp)
4747
mkdir "${HOME}/spirv-tools"
48-
curl -fL -o "$tmparch" https://storage.googleapis.com/spirv-tools/artifacts/prod/graphics_shader_compiler/spirv-tools/windows-msvc-2017-release/continuous/1232/20200928-085551/install.zip
48+
curl -fL -o "$tmparch" https://storage.googleapis.com/spirv-tools/artifacts/prod/graphics_shader_compiler/spirv-tools/windows-msvc-2017-release/continuous/1391/20210313-183536/install.zip
4949
unzip "$tmparch" -d "${HOME}/spirv-tools"
5050
- if: ${{ runner.os == 'Windows' }}
5151
# Runs separately to add spir-v tools to Powershell's Path.
@@ -77,7 +77,7 @@ jobs:
7777
7878
lint:
7979
name: Lint
80-
runs-on: ubuntu-latest
80+
runs-on: ubuntu-20.04
8181
steps:
8282
# Note that we are explicitly NOT checking out submodules, to validate
8383
# that we haven't accidentally enabled spirv-tools native compilation
@@ -90,7 +90,7 @@ jobs:
9090
- name: Install spirv-tools
9191
run: |
9292
mkdir "${HOME}/spirv-tools"
93-
curl -fL https://storage.googleapis.com/spirv-tools/artifacts/prod/graphics_shader_compiler/spirv-tools/linux-clang-release/continuous/1305/20201026-063148/install.tgz | tar -xz -C "${HOME}/spirv-tools"
93+
curl -fL https://storage.googleapis.com/spirv-tools/artifacts/prod/graphics_shader_compiler/spirv-tools/linux-clang-release/continuous/1409/20210313-175801/install.tgz | tar -xz -C "${HOME}/spirv-tools"
9494
echo "${HOME}/spirv-tools/install/bin" >> $GITHUB_PATH
9595
- name: Install rustup components
9696
run: rustup component add rustfmt clippy
@@ -102,7 +102,7 @@ jobs:
102102
run: .github/workflows/clippy.sh
103103

104104
cargo-deny:
105-
runs-on: ubuntu-latest
105+
runs-on: ubuntu-20.04
106106
steps:
107107
- uses: actions/checkout@v2
108108
- uses: EmbarkStudios/cargo-deny-action@v1

Cargo.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/rustc_codegen_spirv/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ rustc-demangle = "0.1.18"
3434
serde = { version = "1.0", features = ["derive"] }
3535
serde_json = "1.0"
3636
smallvec = "1.6.1"
37-
spirv-tools = { version = "0.4.0", default-features = false }
37+
spirv-tools = { version = "0.5.0", default-features = false }
3838
tar = "0.4.30"
3939
topological-sort = "0.1"
4040

0 commit comments

Comments
 (0)