Skip to content

Commit

Permalink
Merge pull request #27 from tombh/use-shader-lock-file-to-get-toolcha…
Browse files Browse the repository at this point in the history
…in-version

Use shader's `Cargo.toml` to get `spirv-builder` version and toolchain
  • Loading branch information
schell authored Dec 21, 2024
2 parents e4b1ad8 + 2395dd7 commit 35c2132
Show file tree
Hide file tree
Showing 17 changed files with 1,045 additions and 331 deletions.
28 changes: 18 additions & 10 deletions .github/workflows/push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,12 @@ env:
jobs:
install-and-build-shaders:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
os:
- ubuntu-latest
- macos-latest
- windows-latest
runs-on: ${{ matrix.os }}
defaults:
run:
Expand All @@ -24,18 +28,22 @@ jobs:
steps:
- uses: actions/checkout@v2
- uses: moonrepo/setup-rust@v1
- run: rustup default stable
- run: rustup update
- uses: extractions/setup-just@v2
- name: Install Rust toolchain
run: |
rustup default stable
rustup update
- run: cargo test
- run: cargo install --path crates/cargo-gpu
- run: cargo gpu install
- run: cargo gpu build --shader-crate crates/shader-crate-template --output-dir test-shaders
- run: ls -lah test-shaders
- run: cat test-shaders/manifest.json
- name: Run a full build
run: just build-shader-template


clippy:
lints:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: moonrepo/setup-rust@v1
- run: cargo clippy
- uses: extractions/setup-just@v2
- uses: cargo-bins/cargo-binstall@main
- run: just setup-lints
- run: just lints
Loading

0 comments on commit 35c2132

Please sign in to comment.