Skip to content

Commit

Permalink
Further iteration
Browse files Browse the repository at this point in the history
  • Loading branch information
cwfitzgerald committed Oct 25, 2023
1 parent f96f272 commit cd9d5ed
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ jobs:
run: |
set -e
cargo xtask test --llvm-cov --all-features
cargo xtask test --llvm-cov
- uses: actions/upload-artifact@v3
if: always() # We want artifacts even if the tests fail.
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lazy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- name: Convert shaders
run: |
cd naga
for file in data/*.spv do echo "Translating" ${file} && ../target/release/naga --validate 27 ${file} ${file}.metal; done
for file in data/*.spv ; do echo "Translating" ${file} && target/release/naga --validate 27 ${file} ${file}.metal; done
parse-vulkan-tutorial-shaders:
name: Parse Sascha Willems Vulkan tutorial shaders
Expand Down Expand Up @@ -168,12 +168,12 @@ jobs:
- name: Test minimal (without span)
run: |
cd naga
cargo nextest run --features validate -p naga
cargo nextest run -p naga --features validate
- name: Test all (without validation)
run: |
cd naga
cargo nextest run --features wgsl-in,wgsl-out,glsl-in,glsl-out,spv-in,spv-out,msl-out,hlsl-out,dot-out --workspace
cargo nextest run -p naga --features wgsl-in,wgsl-out,glsl-in,glsl-out,spv-in,spv-out,msl-out,hlsl-out,dot-out
- name: Check snapshots (without validation)
run: |
Expand Down
3 changes: 2 additions & 1 deletion naga/src/span.rs
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ impl<E> WithSpan<E> {
}

/// Add a new span with description.
#[cfg_attr(not(feature = "span"), allow(unused_variables, unused_mut))]
#[cfg_attr(not(feature = "span"), allow(unused_variables, unused_mut, clippy::missing_const_for_fn))]
pub fn with_span<S>(mut self, span: Span, description: S) -> Self
where
S: ToString,
Expand Down Expand Up @@ -249,6 +249,7 @@ impl<E> WithSpan<E> {
}

#[cfg(not(feature = "span"))]
#[allow(clippy::missing_const_for_fn)]
/// Return a [`SourceLocation`] for our first span, if we have one.
pub fn location(&self, _source: &str) -> Option<SourceLocation> {
None
Expand Down
2 changes: 1 addition & 1 deletion naga/xtask/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ fn run(args: Args) -> anyhow::Result<()> {
ValidateSubcommand::Wgsl => {
visit_files(snapshots_base_out, "wgsl/*.wgsl", |path| {
ack_visiting(path);
EasyCommand::new("cargo", |cmd| cmd.args(["run", "--"]).arg(path)).success()
EasyCommand::new("cargo", |cmd| cmd.args(["run", "-p", "naga-cli", "--"]).arg(path)).success()
})
}
ValidateSubcommand::Hlsl(cmd) => {
Expand Down

0 comments on commit cd9d5ed

Please sign in to comment.