ci(windows): address review feedback

Signed-off-by: Piotr Mlocek <pmlocek@nvidia.com>

Author: pimlock

.agents/skills/build-openshell-mxc-windows/SKILL.md

@@ -114,7 +114,7 @@ The lane targets a Windows host with Visual Studio Build Tools and rustup.
 | Visual Studio 2022 or newer | `where.exe cl.exe` from a Developer PowerShell | Build Tools, Community, Professional, and Enterprise editions work when the target C++ components are installed. The wrapper discovers `VsDevCmd.bat` through `OPENSHELL_VSDEVCMD`, `vswhere`, or installed release directories such as `18` and `2022`. |
 | Visual C++ ARM64 tools | `vswhere -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.ARM64 -property installationPath` | Required for native ARM64 check, build, and tests and for x64-to-ARM64 check/build. Tests always require a native runner. |
 | Visual C++ ARM64 Spectre-mitigated libraries | `vswhere -latest -products * -requires Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre -property installationPath` | Required by `regorus` through `msvc_spectre_libs`; the build fails when the selected MSVC toolset lacks `lib\spectre\arm64`. |
-| Visual C++ Clang tools | `vswhere -latest -products * -requires Microsoft.VisualStudio.Component.VC.Llvm.Clang -property installationPath` | Provides host-native `libclang.dll` for `bindgen` and `clang-cl.exe` for ARM64 crypto dependencies such as `ring` and `aws-lc-sys`. On ARM64, the wrapper uses `VC\Tools\Llvm\Arm64\bin`. |
+| Visual C++ Clang tools | `vswhere -latest -products * -requires Microsoft.VisualStudio.Component.VC.Llvm.Clang -property installationPath` | Provides host-native `libclang.dll` for `bindgen` and `clang-cl.exe` for ARM64 crypto dependencies such as `aws-lc-sys`. On ARM64, the wrapper uses `VC\Tools\Llvm\Arm64\bin`. |
 | Visual C++ CMake tools | `vswhere -latest -products * -requires Microsoft.VisualStudio.Component.VC.CMake.Project -property installationPath` | Provides CMake and Ninja for native dependencies. The x64-to-ARM64 path adds Ninja to `PATH`; Z3 uses an architecture-specific prebuilt release. |
 | Windows SDK | `where.exe rc.exe` from a Developer PowerShell | Install an SDK containing target libraries and ARM64 tools. |
 | Rust via rustup | `rustc --version` | Add each target being validated: `x86_64-pc-windows-msvc` and/or `aarch64-pc-windows-msvc`. The wrapper also adds the selected target. |

.agents/skills/build-openshell-mxc-windows/reference.md

@@ -68,7 +68,7 @@ file.
 For ARM64, verify the Visual Studio instance contains the ARM64 MSVC tools,
 ARM64 Spectre-mitigated libraries, Clang tools, CMake tools, and a Windows SDK.
 Clang supplies host-native `libclang.dll` for `bindgen` and `clang-cl.exe` for
-ARM64 crypto dependencies such as `ring` and `aws-lc-sys`. Native and
+ARM64 crypto dependencies such as `aws-lc-sys`. Native and
 x64-to-ARM64 builds use the official prebuilt Z3 4.16.0 static library for the
 target architecture. An x64-to-ARM64 check/build discovers and adds host-native
 Ninja to `PATH`, while the crypto crates select `clang-cl`. Use a short

.github/workflows/windows-msvc.yml

@@ -17,6 +17,8 @@ concurrency:
   cancel-in-progress: true
 
 env:
+  # sccache cannot cache incremental Rust compilations, and rust-cache removes
+  # incremental artifacts before saving the target directory.
   CARGO_INCREMENTAL: "0"
 
 jobs:
@@ -70,11 +72,15 @@ jobs:
       - name: Isolate Rust toolchains
         # rust-cache hashes every installed toolchain, including unused runner defaults.
         run: '"RUSTUP_HOME=$env:RUNNER_TEMP/openshell-rustup" >> $env:GITHUB_ENV'
-      - uses: dtolnay/rust-toolchain@4be7066ada62dd38de10e7b70166bc74ed198c30 # stable
-        with:
-          toolchain: "1.95.0"
-          targets: ${{ matrix.rust_target }}
-          components: clippy
+      - name: Install Rust toolchain
+        # GitHub-hosted runners include rustup. With no toolchain argument,
+        # rustup installs the checked-in rust-toolchain.toml configuration:
+        # https://github.com/dtolnay/rust-toolchain/issues/133#issuecomment-2610825530
+        run: |
+          rustup set profile minimal
+          rustup toolchain install
+          rustup component add clippy
+          rustup target add ${{ matrix.rust_target }}
       - name: Install cargo-nextest
         run: mise install --locked github:nextest-rs/nextest
       - name: Cache Rust target and registry
@@ -129,11 +135,12 @@ jobs:
         uses: mozilla-actions/sccache-action@9e7fa8a12102821edf02ca5dbea1acd0f89a2696 # v0.0.10
       - name: Isolate Rust toolchains
         run: '"RUSTUP_HOME=$env:RUNNER_TEMP/openshell-rustup" >> $env:GITHUB_ENV'
-      - uses: dtolnay/rust-toolchain@4be7066ada62dd38de10e7b70166bc74ed198c30 # stable
-        with:
-          toolchain: "1.95.0"
-          targets: ${{ matrix.rust_target }}
-          components: clippy
+      - name: Install Rust toolchain
+        run: |
+          rustup set profile minimal
+          rustup toolchain install
+          rustup component add clippy
+          rustup target add ${{ matrix.rust_target }}
       - name: Install cargo-nextest
         run: mise install --locked github:nextest-rs/nextest
       - name: Cache Rust target and registry
@@ -185,10 +192,11 @@ jobs:
         uses: mozilla-actions/sccache-action@9e7fa8a12102821edf02ca5dbea1acd0f89a2696 # v0.0.10
       - name: Isolate Rust toolchains
         run: '"RUSTUP_HOME=$env:RUNNER_TEMP/openshell-rustup" >> $env:GITHUB_ENV'
-      - uses: dtolnay/rust-toolchain@4be7066ada62dd38de10e7b70166bc74ed198c30 # stable
-        with:
-          toolchain: "1.95.0"
-          targets: ${{ matrix.rust_target }}
+      - name: Install Rust toolchain
+        run: |
+          rustup set profile minimal
+          rustup toolchain install
+          rustup target add ${{ matrix.rust_target }}
       - name: Cache Rust target and registry
         uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
         env: