@@ -112,13 +112,26 @@ jobs:
112
112
echo "VK_ICD_FILENAMES=$SWIFTSHADER_DEST_DIR\vk_swiftshader_icd.json" >> $GITHUB_ENV
113
113
fi
114
114
115
- - name : Install Rust
116
- uses : dtolnay/rust-toolchain@stable
117
- with :
118
- components : rust-src, rustc-dev, llvm-tools
115
+ - name : Install Rust via rustup
116
+ shell : bash
117
+ run : |
118
+ # Install rustup if not already installed
119
+ if ! command -v rustup &> /dev/null; then
120
+ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal
121
+ source "$HOME/.cargo/env"
122
+ fi
123
+
124
+ # Install stable toolchain with required components
125
+ rustup toolchain install stable
126
+ rustup component add rust-src rustc-dev llvm-tools --toolchain stable
127
+ rustup default stable
119
128
120
129
- name : Install cargo-gpu
130
+ shell : bash
121
131
run : |
132
+ # Ensure cargo is in PATH
133
+ source "$HOME/.cargo/env" || true
134
+
122
135
# Set non-interactive mode to avoid raw mode issues in CI
123
136
export CARGO_TERM_COLOR=never
124
137
export CI=true
@@ -134,13 +147,18 @@ jobs:
134
147
135
148
- name : Compile shaders to SPIR-V
136
149
working-directory : shaders/rust
150
+ shell : bash
137
151
run : |
152
+ # Ensure cargo is in PATH
153
+ source "$HOME/.cargo/env" || true
154
+
138
155
# Set non-interactive mode for cargo-gpu
139
156
export CARGO_TERM_COLOR=never
140
157
export CI=true
141
158
python3 compileshaders.py
142
159
143
160
- name : Verify no uncommitted changes
161
+ shell : bash
144
162
run : |
145
163
# Check if there are any changes to tracked files
146
164
if ! git diff --exit-code; then
0 commit comments