Skip to content

Commit 35c2132

Browse files
authored
Merge pull request #27 from tombh/use-shader-lock-file-to-get-toolchain-version
Use shader's `Cargo.toml` to get `spirv-builder` version and toolchain
2 parents e4b1ad8 + 2395dd7 commit 35c2132

File tree

17 files changed

+1045
-331
lines changed

17 files changed

+1045
-331
lines changed

.github/workflows/push.yaml

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,12 @@ env:
1313
jobs:
1414
install-and-build-shaders:
1515
strategy:
16+
fail-fast: false
1617
matrix:
17-
os: [ubuntu-latest, macos-latest, windows-latest]
18+
os:
19+
- ubuntu-latest
20+
- macos-latest
21+
- windows-latest
1822
runs-on: ${{ matrix.os }}
1923
defaults:
2024
run:
@@ -24,18 +28,22 @@ jobs:
2428
steps:
2529
- uses: actions/checkout@v2
2630
- uses: moonrepo/setup-rust@v1
27-
- run: rustup default stable
28-
- run: rustup update
31+
- uses: extractions/setup-just@v2
32+
- name: Install Rust toolchain
33+
run: |
34+
rustup default stable
35+
rustup update
2936
- run: cargo test
30-
- run: cargo install --path crates/cargo-gpu
31-
- run: cargo gpu install
32-
- run: cargo gpu build --shader-crate crates/shader-crate-template --output-dir test-shaders
33-
- run: ls -lah test-shaders
34-
- run: cat test-shaders/manifest.json
37+
- name: Run a full build
38+
run: just build-shader-template
39+
3540

36-
clippy:
41+
lints:
3742
runs-on: ubuntu-latest
3843
steps:
3944
- uses: actions/checkout@v2
4045
- uses: moonrepo/setup-rust@v1
41-
- run: cargo clippy
46+
- uses: extractions/setup-just@v2
47+
- uses: cargo-bins/cargo-binstall@main
48+
- run: just setup-lints
49+
- run: just lints

0 commit comments

Comments
 (0)