Address feedback

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

@@ -0,0 +1,14 @@
+# We make this tool its own workspace as it doesn't share dependencies with the
+# rest of the workspace, and it shouldn't be built normally, only as a helper
+# for CI so it would just slow down local development for no reason
+[workspace]
+
+[package]
+name = "install-spirv-tools"
+edition = "2021"
+version = "0.1.0"
+publish = false
+
+[dependencies]
+tar = "0.4"
+zstd = "0.13"

.github/workflows/ci.yaml

@@ -14,13 +14,10 @@ jobs:
         include:
           - os: ubuntu-20.04-16core
             target: x86_64-unknown-linux-gnu
-            host: x86_64-unknown-linux-gnu
           - os: windows-2022-16core
             target: x86_64-pc-windows-msvc
-            host: x86_64-pc-windows-msvc
           - os: macOS-latest-xl
             target: x86_64-apple-darwin
-            host: x86_64-apple-darwin
           - os: ubuntu-20.04-16core
             target: aarch64-linux-android
             host: x86_64-unknown-linux-gnu
@@ -35,7 +32,7 @@ jobs:
       # the binaries to the specified path, and adds them to PATH
       - name: Install spirv-tools binaries
         shell: bash
-        run: cargo run --manifest-path .github/install-tools/Cargo.toml -- ${{matrix.host}} 0.10.0 "${{github.workspace}}/bin"
+        run: cargo run --manifest-path .github/install-spirv-tools/Cargo.toml -- ${{matrix.host || matrix.target}} 0.10.0 "${{github.workspace}}/bin"
       - if: ${{ runner.os == 'Linux' }}
         name: Linux - Install native dependencies
         run: sudo apt install libwayland-cursor0 libxkbcommon-dev libwayland-dev

.gitignore

@@ -2,4 +2,4 @@ target/
 .vscode/
 .vim/
 tests/Cargo.lock
-.github/install-tools/Cargo.lock
+.github/install-spirv-tools/Cargo.lock

Cargo.toml

@@ -31,10 +31,11 @@ license = "MIT OR Apache-2.0"
 repository = "https://github.com/EmbarkStudios/rust-gpu"
 
 [workspace.dependencies]
+spirv-builder = { path = "./crates/spirv-builder", version = "=0.9.0", default-features = false }
 spirv-std = { path = "./crates/spirv-std", version = "=0.9.0" }
 spirv-std-types = { path = "./crates/spirv-std/shared", version = "=0.9.0" }
 spirv-std-macros = { path = "./crates/spirv-std/macros", version = "=0.9.0" }
-spirv-builder = { path = "./crates/spirv-builder", version = "=0.9.0", default-features = false  }
+spirv-tools = { version = "0.10", default-features = false }
 rustc_codegen_spirv = { path = "./crates/rustc_codegen_spirv", version = "=0.9.0", default-features = false }
 rustc_codegen_spirv-types = { path = "./crates/rustc_codegen_spirv-types", version = "=0.9.0" }
 

crates/rustc_codegen_spirv/Cargo.toml

@@ -51,14 +51,14 @@ ar = "0.9.0"
 either = "1.8.0"
 indexmap = "1.6.0"
 rspirv = "0.11"
+rustc_codegen_spirv-types.workspace = true
 rustc-demangle = "0.1.21"
 sanitize-filename = "0.4"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 smallvec = { version = "1.6.1", features = ["union"] }
-spirv-tools = { version = "0.10", default-features = false }
-rustc_codegen_spirv-types.workspace = true
 spirt = "0.3.0"
+spirv-tools.workspace = true
 lazy_static = "1.4.0"
 itertools = "0.10.5"