From a3da12fca8c10b755a4e627f78d354ebeaad7fa5 Mon Sep 17 00:00:00 2001
From: Simon Davies <simongdavies@users.noreply.github.com>
Date: Mon, 9 Nov 2026 14:28:57 +0000
Subject: [PATCH] Temporary fix until hyperlight-host preserves the surrogate
 inside OUT_DIR. rust-cache removes it but retains build-script state.

Signed-off-by: Simon Davies <simongdavies@users.noreply.github.com>
---
 .github/workflows/dep_benchmarks.yml  |  7 +++++++
 .github/workflows/dep_build.yml       |  7 +++++++
 .github/workflows/dep_code_checks.yml | 10 +++++++++-
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/dep_benchmarks.yml b/.github/workflows/dep_benchmarks.yml
index 1e4b893..686adf2 100644
--- a/.github/workflows/dep_benchmarks.yml
+++ b/.github/workflows/dep_benchmarks.yml
@@ -85,6 +85,13 @@ jobs:
         with:
           path: target/hyperlight-js-runtime/sysroot
           key: sysroot-${{ matrix.build }}-${{ hashFiles('rust-toolchain.toml') }}
+          
+      # Temporary workaround until hyperlight-host preserves the surrogate
+      # inside OUT_DIR. rust-cache removes it but retains build-script state.
+      # can be removed once a hyperlight-host with https://github.com/hyperlight-dev/hyperlight/pull/2038 is referenced.
+      - name: Invalidate cached Windows surrogate build
+        if: runner.os == 'Windows'
+        run: cargo clean -p hyperlight-host --profile release
 
       - name: Build
         env:
diff --git a/.github/workflows/dep_build.yml b/.github/workflows/dep_build.yml
index ce19917..8d4c4ad 100644
--- a/.github/workflows/dep_build.yml
+++ b/.github/workflows/dep_build.yml
@@ -198,6 +198,13 @@ jobs:
         path: target/hyperlight-js-runtime/sysroot
         key: sysroot-${{ matrix.build }}-${{ hashFiles('rust-toolchain.toml') }}
 
+    # Temporary workaround until hyperlight-host preserves the surrogate
+    # inside OUT_DIR. rust-cache removes it but retains build-script state.
+    # can be removed once a hyperlight-host with https://github.com/hyperlight-dev/hyperlight/pull/2038 is referenced.
+    - name: Invalidate cached Windows surrogate build
+      if: runner.os == 'Windows'
+      run: cargo clean -p hyperlight-host --profile ${{ matrix.config == 'debug' && 'dev' || matrix.config }} 
+
     - name: Build
       run: |
           just build ${{ matrix.config }}
diff --git a/.github/workflows/dep_code_checks.yml b/.github/workflows/dep_code_checks.yml
index 5c08e48..d9922a4 100644
--- a/.github/workflows/dep_code_checks.yml
+++ b/.github/workflows/dep_code_checks.yml
@@ -116,7 +116,6 @@ jobs:
 
       - uses: hyperlight-dev/ci-setup-workflow@59673866360458f8dd035f4a9fa766aeebad2038 # v2.3.1
         with:
-          rust-toolchain: "1.90"
           just-version: "1.51"
 
       - name: Rust cache
@@ -143,6 +142,15 @@ jobs:
         shell: bash
         run: echo "skip=${{ steps.rust-cache.outputs.cache-hit == 'true' && steps.sysroot-cache.outputs.cache-hit == 'true' }}" >> "$GITHUB_OUTPUT"
 
+      # Temporary workaround until hyperlight-host preserves the surrogate
+      # inside OUT_DIR. rust-cache removes it but retains build-script state.
+      # can be removed once a hyperlight-host with https://github.com/hyperlight-dev/hyperlight/pull/2038 is referenced.
+      - name: Invalidate cached Windows surrogate build
+        if: runner.os == 'Windows'
+        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