File tree Expand file tree Collapse file tree 2 files changed +7
-10
lines changed Expand file tree Collapse file tree 2 files changed +7
-10
lines changed Original file line number Diff line number Diff line change 9
9
- master
10
10
11
11
env :
12
- # For setup-rust, see https://github.com/moonrepo/setup-rust/issues/22
13
- GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
12
+ RUST_LOG : debug
14
13
15
14
jobs :
16
15
test :
@@ -113,16 +112,13 @@ jobs:
113
112
echo "VK_ICD_FILENAMES=$SWIFTSHADER_DEST_DIR\vk_swiftshader_icd.json" >> $GITHUB_ENV
114
113
fi
115
114
116
- - name : Setup Rust
117
- uses : moonrepo/setup-rust@v1
118
- env :
119
- GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
120
-
121
115
- name : Install Rust toolchain
116
+ uses : dtolnay/rust-toolchain@stable
117
+
118
+ - name : Install nightly toolchain for cargo-gpu
122
119
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
126
122
rustup toolchain install nightly
127
123
rustup component add rust-src rustc-dev llvm-tools --toolchain nightly
128
124
Original file line number Diff line number Diff line change @@ -31,6 +31,7 @@ def compile_shader(shader_dir):
31
31
"--shader-crate" , str (shader_dir ),
32
32
"--output-dir" , str (shader_dir ),
33
33
"--multimodule" , # Split into separate files per entry point
34
+ "--auto-install-rust-toolchain" , # Auto-install required toolchain in CI
34
35
], capture_output = False )
35
36
36
37
if result .returncode == 0 :
You can’t perform that action at this time.
0 commit comments