From 0a17b24451545637db506f1bc531ab9abecd61d0 Mon Sep 17 00:00:00 2001 From: Bradlee Speice Date: Fri, 19 Jun 2026 19:54:03 -0400 Subject: [PATCH 1/3] Automatically install rust toolchain for CI --- enkou-shaders-tests/build.rs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/enkou-shaders-tests/build.rs b/enkou-shaders-tests/build.rs index 09bd720..490fcf5 100644 --- a/enkou-shaders-tests/build.rs +++ b/enkou-shaders-tests/build.rs @@ -9,9 +9,11 @@ pub fn main() -> anyhow::Result<()> { .copied() .collect::(); - let install = Install::from_shader_crate(crate_path.clone()) - .within_build_script() - .run()?; + 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 mut builder = install.to_spirv_builder(crate_path, "spirv-unknown-vulkan1.3"); builder.build_script.defaults = true; builder.shader_panic_strategy = ShaderPanicStrategy::SilentExit; From 24a40adcadbf39273d644d8ad8ddb88c2b065830 Mon Sep 17 00:00:00 2001 From: Bradlee Speice Date: Fri, 19 Jun 2026 21:49:29 -0400 Subject: [PATCH 2/3] Revert "Automatically install rust toolchain for CI" This reverts commit 0a17b24451545637db506f1bc531ab9abecd61d0. --- enkou-shaders-tests/build.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/enkou-shaders-tests/build.rs b/enkou-shaders-tests/build.rs index 490fcf5..09bd720 100644 --- a/enkou-shaders-tests/build.rs +++ b/enkou-shaders-tests/build.rs @@ -9,11 +9,9 @@ pub fn main() -> anyhow::Result<()> { .copied() .collect::(); - 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; From 35784514d624f29eb321fdb982508b38b0267d48 Mon Sep 17 00:00:00 2001 From: Bradlee Speice Date: Fri, 19 Jun 2026 21:50:41 -0400 Subject: [PATCH 3/3] Fix the CI action, the build scripts were fine --- .gitea/workflows/ci.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index f19e4a7..f12d822 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -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