2 Commits

Author SHA1 Message Date
bspeice 35784514d6 Fix the CI action, the build scripts were fine
CI / cargo fmt (push) Successful in 25s
CI / cargo test (push) Successful in 13m3s
CI / cargo test (GPU) (push) Successful in 12m57s
2026-06-19 21:50:41 -04:00
bspeice 24a40adcad Revert "Automatically install rust toolchain for CI"
This reverts commit 0a17b24451.
2026-06-19 21:49:29 -04:00
2 changed files with 4 additions and 12 deletions
+1 -7
View File
@@ -7,8 +7,6 @@ jobs:
formatting:
name: cargo fmt
runs-on: ubuntu-latest
env:
RUNNER_TOOL_CACHE: /toolcache
steps:
- uses: actions/checkout@v6
- uses: actions-rust-lang/setup-rust-toolchain@v1
@@ -20,8 +18,6 @@ jobs:
test:
name: cargo test
runs-on: ubuntu-latest
env:
RUNNER_TOOL_CACHE: /toolcache
steps:
- uses: actions/checkout@v6
- uses: actions-rust-lang/setup-rust-toolchain@v1
@@ -31,10 +27,8 @@ jobs:
test-gpu:
name: cargo test (GPU)
runs-on: ubuntu-latest
env:
RUNNER_TOOL_CACHE: /toolcache
steps:
- uses: actions/checkout@v6
- uses: actions-rust-lang/setup-rust-toolchain@v1
- run: cargo install --git https://github.com/rust-gpu/rust-gpu cargo-gpu
- run: cargo gpu check -p enkou-shaders
- run: cargo gpu check --auto-install-rust-toolchain -p enkou-shaders
+3 -5
View File
@@ -9,11 +9,9 @@ pub fn main() -> anyhow::Result<()> {
.copied()
.collect::<PathBuf>();
let mut install = Install::from_shader_crate(crate_path.clone());
install.build_script = true;
install.auto_install_rust_toolchain = true;
let install = install.run()?;
let install = Install::from_shader_crate(crate_path.clone())
.within_build_script()
.run()?;
let mut builder = install.to_spirv_builder(crate_path, "spirv-unknown-vulkan1.3");
builder.build_script.defaults = true;
builder.shader_panic_strategy = ShaderPanicStrategy::SilentExit;