Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/cargo/syn-2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Joeoc2001 authored Oct 19, 2023
2 parents 8c913d6 + 98aa2de commit 3534f13
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 2 deletions.
22 changes: 22 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: CI
on: [push, pull_request]

jobs:
cargo-check:
name: Cargo check all
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
- run: cargo check --all-targets
cargo-test:
name: Cargo test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
- run: cargo test
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ include = ["/Cargo.toml", "/LICENSE", "/README.md", "/src/**"]

[dependencies]
syn = { version = "2.0", features = ["full"] }
naga = { version = "0.12", features = ["wgsl-in", "wgsl-out"] }
naga = { version = "0.13", features = ["wgsl-in", "wgsl-out"] }
naga-to-tokenstream = "0.1"
proc-macro2 = "1.0"
quote = "1.0"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# WGSL Inline
[![crates.io](https://img.shields.io/crates/v/wgsl-inline.svg)](https://crates.io/crates/wgsl-inline)
[![docs.rs](https://img.shields.io/docsrs/wgsl-inline)](https://docs.rs/wgsl-inline/latest/wgsl-inline/)
[![docs.rs](https://img.shields.io/docsrs/wgsl-inline)](https://docs.rs/wgsl-inline/latest/wgsl_inline/)
[![crates.io](https://img.shields.io/crates/l/wgsl-inline.svg)](https://github.com/LucentFlux/wgsl-inline/blob/main/LICENSE)

WGSL Inline adds a macro, `wgsl!`, which takes WGSL sourcecode and validates it, reporting any errors to the Rust compiler.
Expand Down

0 comments on commit 3534f13

Please sign in to comment.