Fix installing naga-cli from git (gfx-rs#2398)

Move hl-snapshots out from the xtask workspace, since it's also used as a dev dependency in the naga crate itself for a test.
fornwall · Jul 7, 2023 · 981c1f9 · 981c1f9
1 parent 7624d6c
commit 981c1f9
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 4 deletions.
diff --git a/.github/workflows/validation-windows.yml b/.github/workflows/validation-windows.yml
@@ -6,6 +6,7 @@ on:
       - 'tests/out/hlsl/*.hlsl'
       - 'tests/out/hlsl/*.ron'
       - 'xtask/**'
+      - 'hlsl-snapshots/**'
 
 jobs:
   validate-windows-dxc:

diff --git a/Cargo.toml b/Cargo.toml
@@ -69,7 +69,7 @@ bincode = "1"
 criterion = { version = "0.3", features = [] }
 diff = "0.1"
 env_logger = "0.9"
-hlsl-snapshots = { path = "./xtask/hlsl-snapshots"}
+hlsl-snapshots = { path = "./hlsl-snapshots"}
 # Require at least version 0.7.1 of ron, this version changed how floating points are
 # serialized by forcing them to always have the decimal part, this makes it backwards
 # incompatible with our tests because we do a syntatic diff and not a semantic one.

diff --git a/xtask/hlsl-snapshots/Cargo.toml → hlsl-snapshots/Cargo.toml b/xtask/hlsl-snapshots/Cargo.toml → hlsl-snapshots/Cargo.toml
diff --git a/xtask/hlsl-snapshots/src/lib.rs → hlsl-snapshots/src/lib.rs b/xtask/hlsl-snapshots/src/lib.rs → hlsl-snapshots/src/lib.rs
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
@@ -8,12 +8,10 @@ publish = false
 anyhow = "1"
 env_logger = { version = "0.10.0", default-features = false }
 glob = "0.3.1"
-hlsl-snapshots = { path = "./hlsl-snapshots"}
+hlsl-snapshots = { path = "../hlsl-snapshots"}
 log = "0.4.17"
 pico-args = "0.5.0"
 shell-words = "1.1.0"
 which = "4.4.0"
 
 [workspace]
-
-members = [".", "./hlsl-snapshots"]