Skip to content

Commit fcc9c65

Browse files
committed
Ok maybe this works
1 parent 8f33e8e commit fcc9c65

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

.github/workflows/rust.yml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ on:
99
- master
1010

1111
env:
12-
# For setup-rust, see https://github.com/moonrepo/setup-rust/issues/22
13-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
12+
RUST_LOG: debug
1413

1514
jobs:
1615
test:
@@ -113,16 +112,13 @@ jobs:
113112
echo "VK_ICD_FILENAMES=$SWIFTSHADER_DEST_DIR\vk_swiftshader_icd.json" >> $GITHUB_ENV
114113
fi
115114
116-
- name: Setup Rust
117-
uses: moonrepo/setup-rust@v1
118-
env:
119-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
120-
121115
- name: Install Rust toolchain
116+
uses: dtolnay/rust-toolchain@stable
117+
118+
- name: Install nightly toolchain for cargo-gpu
122119
run: |
123-
rustup default stable
124-
rustup update
125-
# Install nightly toolchain with required components for cargo-gpu
120+
# cargo-gpu will auto-install its required toolchain version
121+
# but we need a base nightly toolchain
126122
rustup toolchain install nightly
127123
rustup component add rust-src rustc-dev llvm-tools --toolchain nightly
128124

shaders/rust/compileshaders.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ def compile_shader(shader_dir):
3131
"--shader-crate", str(shader_dir),
3232
"--output-dir", str(shader_dir),
3333
"--multimodule", # Split into separate files per entry point
34+
"--auto-install-rust-toolchain", # Auto-install required toolchain in CI
3435
], capture_output=False)
3536

3637
if result.returncode == 0:

0 commit comments

Comments
 (0)