Fix Windows CI with cached builds and stay under the cache quota

.github/workflows/PrimeCaches.yml

@@ -51,13 +51,13 @@ jobs:
     with:
       prime_cache: true
 
-  # Populate the host caches (key {arch}-{os}-{hypervisor}-{config}) used by
-  # dep_rust.yml. Release entries hold both wasmtime versions, because the LTS
-  # and latest release jobs share them.
+  # Populate the Windows host caches (key {arch}-{os}-{hypervisor}-{config})
+  # used by dep_rust.yml. Release entries hold both wasmtime versions, because
+  # the LTS and latest release jobs share them. Linux builds stay uncached to
+  # fit the repository cache quota.
   host:
     needs: wasm-examples
-    # Linux arm64 runs on 2-CPU VMs and builds release twice.
-    timeout-minutes: ${{ fromJSON(vars.PRIME_CACHES_JOB_TIMEOUT || '90') }}
+    timeout-minutes: ${{ fromJSON(vars.PRIME_CACHES_JOB_TIMEOUT || '45') }}
     strategy:
       fail-fast: false
       matrix:
@@ -74,12 +74,6 @@ jobs:
           - arch: arm64
             hypervisor: hyperv
             config: release
-          - arch: arm64
-            hypervisor: kvm
-            config: debug
-          - arch: arm64
-            hypervisor: kvm
-            config: release
     # Spread load across vendor pools: AMD when run_id ends in 0,2,4,6,8, Intel otherwise.
     runs-on: ${{ fromJson(matrix.arch == 'X64'
         && format('["self-hosted", "Windows", "X64", "1ES.Pool=hld-win2025-{0}", "JobId=prime-cache-{1}-{2}-{3}-{4}-{5}"]',
@@ -89,13 +83,11 @@ jobs:
             github.run_id,
             github.run_number,
             github.run_attempt)
-        || matrix.hypervisor == 'hyperv'
-        && format('["self-hosted", "Windows", "ARM64", "1ES.Pool=hl-windows-arm", "JobId=prime-cache-{0}-{1}-{2}-{3}"]',
+        || format('["self-hosted", "Windows", "ARM64", "1ES.Pool=hl-windows-arm", "JobId=prime-cache-{0}-{1}-{2}-{3}"]',
             matrix.config,
             github.run_id,
             github.run_number,
-            github.run_attempt)
-        || '["self-hosted", "Linux", "arm64", "kvm"]') }}
+            github.run_attempt)) }}
     env:
       JUST_OVERRIDE_ARCH: ${{ matrix.arch == 'X64' && 'x86_64' || 'aarch64' }}
     steps:
@@ -154,10 +146,9 @@ jobs:
       - name: Build host, tests and examples
         if: steps.prime.outputs.skip != 'true'
         run: |
-          features="${{ matrix.hypervisor == 'kvm' && 'kvm' || '' }}"
-          just prime-caches ${{ matrix.config }} $features
+          just prime-caches ${{ matrix.config }}
           if [ "${{ matrix.config }}" = release ]; then
-            just prime-caches release ${features:+$features,}wasmtime_latest
+            just prime-caches release wasmtime_latest
           fi
 
       # A job step, not a post-job step, so the save runs before rust-cache's

.github/workflows/dep_code_checks.yml

@@ -168,6 +168,15 @@ jobs:
           name: guest-modules-X64-lts
           path: .
 
+      # rust-cache deletes the Windows surrogate that hyperlight-host builds
+      # outside OUT_DIR, but keeps its build script state. Remove once
+      # hyperlight-host includes https://github.com/hyperlight-dev/hyperlight/pull/2038.
+      - name: Invalidate cached Windows surrogate build
+        if: steps.prime.outputs.skip != 'true'
+        run: |
+          cargo clean -p hyperlight-host --profile dev
+          cargo clean -p hyperlight-host --profile release
+
       - name: clippy (debug)
         if: steps.prime.outputs.skip != 'true'
         run: just clippy debug

.github/workflows/dep_rust.yml

@@ -134,7 +134,7 @@ jobs:
       # PrimeCaches writes these entries. Keep the steps before them in sync
       # with its host job, because the key hashes toolchains and build env vars.
       - name: Rust cache
-        if: matrix.hypervisor == 'hyperv' || (matrix.arch == 'arm64' && matrix.hypervisor == 'kvm')
+        if: matrix.hypervisor == 'hyperv'
         uses: Swatinem/rust-cache@d1527c8f67ef9af357290475d4af4b0fab8f12e0  # v2.9.3
         with:
           prefix-key: v1-rust
@@ -143,12 +143,19 @@ jobs:
 
       # Restores after rust-cache, which deletes the sysroot on a partial match.
       - name: Restore sysroot cache
-        if: matrix.hypervisor == 'hyperv' || (matrix.arch == 'arm64' && matrix.hypervisor == 'kvm')
+        if: matrix.hypervisor == 'hyperv'
         uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9  # v6.1.0
         with:
           path: target/hyperlight-wasm-runtime/sysroot
           key: sysroot-${{ matrix.arch }}-${{ runner.os }}-${{ matrix.hypervisor }}-${{ hashFiles('rust-toolchain.toml') }}
 
+      # rust-cache deletes the Windows surrogate that hyperlight-host builds
+      # outside OUT_DIR, but keeps its build script state. Remove once
+      # hyperlight-host includes https://github.com/hyperlight-dev/hyperlight/pull/2038.
+      - name: Invalidate cached Windows surrogate build
+        if: matrix.hypervisor == 'hyperv'
+        run: cargo clean -p hyperlight-host --profile ${{ matrix.config == 'debug' && 'dev' || 'release' }}
+
       - name: Download Wasm Modules
         uses: actions/download-artifact@v5
         with:
@@ -240,6 +247,13 @@ jobs:
           path: target/hyperlight-wasm-runtime/sysroot
           key: sysroot-X64-${{ runner.os }}-hyperv-${{ hashFiles('rust-toolchain.toml') }}
 
+      # rust-cache deletes the Windows surrogate that hyperlight-host builds
+      # outside OUT_DIR, but keeps its build script state. Remove once
+      # hyperlight-host includes https://github.com/hyperlight-dev/hyperlight/pull/2038.
+      - name: Invalidate cached Windows surrogate build
+        if: matrix.hypervisor == 'hyperv'
+        run: cargo clean -p hyperlight-host --profile release
+
       - name: Download benchmarks from "latest"
         run: just bench-download ${{ runner.os }} ${{ matrix.hypervisor }} ${{ matrix.cpu }} dev-latest
         env: