Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use shader's Cargo.toml to get spirv-builder version and toolchain #27

Merged
merged 10 commits into from
Dec 21, 2024
Merged

Use shader's Cargo.toml to get spirv-builder version and toolchain #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
87de5da
Rename Spirv to SpirvCLI
tombh Dec 17, 2024
79cb0de
Use shader's Cargo.toml for rust-gpu version/toolchain
tombh Dec 17, 2024
e1b9e8c
Add test comment in spirv_source.rs
schell Dec 19, 2024
3f1ab56
make Git source respect revision, show source command
schell Dec 19, 2024
2ec6524
add extra debugging
schell Dec 20, 2024
1bb88f9
appease clippy
schell Dec 20, 2024
feedfe1
sanitise the path for cargo tree invocation
schell Dec 20, 2024
f1a947b
don't use depth=1 for cargo tree as it misses spirv-std sometimes
schell Dec 20, 2024
fc8ecfc
ensure output-dir is relative to toml when building with `toml`
schell Dec 20, 2024
2395dd7
Fix for failing Windows build
tombh Dec 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 18 additions & 10 deletions .github/workflows/push.yaml
View file
Open in desktop
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
Loading