CI?

Author: LegNeato

.github/workflows/rust.yml

@@ -9,7 +9,8 @@ on:
       - master
 
 env:
-  CARGO_TERM_COLOR: always
+  # For setup-rust, see https://github.com/moonrepo/setup-rust/issues/22
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
 jobs:
   test:
@@ -112,30 +113,26 @@ jobs:
             echo "VK_ICD_FILENAMES=$SWIFTSHADER_DEST_DIR\vk_swiftshader_icd.json" >> $GITHUB_ENV
           fi
       
-      - name: Install Rust via rustup
-        shell: bash
+      - name: Setup Rust
+        uses: moonrepo/setup-rust@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      
+      - name: Install Rust toolchain
         run: |
-          # Install rustup if not already installed
-          if ! command -v rustup &> /dev/null; then
-            curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal
-            source "$HOME/.cargo/env"
-          fi
-          
-          # Install stable toolchain with required components
-          rustup toolchain install stable
-          rustup component add rust-src rustc-dev llvm-tools --toolchain stable
           rustup default stable
+          rustup update
+          # Install nightly toolchain with required components for cargo-gpu
+          rustup toolchain install nightly
+          rustup component add rust-src rustc-dev llvm-tools --toolchain nightly
       
       - name: Install cargo-gpu
         shell: bash
+        env:
+          RUST_LOG: debug
         run: |
-          # Ensure cargo is in PATH
-          source "$HOME/.cargo/env" || true
-          
-          # Set non-interactive mode to avoid raw mode issues in CI
-          export CARGO_TERM_COLOR=never
-          export CI=true
-          cargo install --git https://github.com/rust-gpu/cargo-gpu cargo-gpu
+          # Install cargo-gpu with locked dependencies
+          cargo install --git https://github.com/rust-gpu/cargo-gpu cargo-gpu --locked
       
       - name: Cache cargo registry
         uses: actions/cache@v3
@@ -148,13 +145,9 @@ jobs:
       - name: Compile shaders to SPIR-V
         working-directory: shaders/rust
         shell: bash
+        env:
+          RUST_LOG: debug
         run: |
-          # Ensure cargo is in PATH
-          source "$HOME/.cargo/env" || true
-          
-          # Set non-interactive mode for cargo-gpu
-          export CARGO_TERM_COLOR=never
-          export CI=true
           python3 compileshaders.py
       
       - name: Verify no uncommitted changes