From 09c7319d280b42054e428641814d9abb673cdf67 Mon Sep 17 00:00:00 2001
From: Ludvig Liljenberg <4257730+ludfjig@users.noreply.github.com>
Date: Tue, 17 Mar 2026 15:39:37 -0700
Subject: [PATCH] Remove windows server 2022 from ci

Signed-off-by: Ludvig Liljenberg <4257730+ludfjig@users.noreply.github.com>
---
 .github/workflows/CreateRelease.yml       | 12 +++---------
 .github/workflows/DailyBenchmarks.yml     |  2 +-
 .github/workflows/ValidatePullRequest.yml |  4 ++--
 .github/workflows/dep_benchmarks.yml      |  4 ++--
 .github/workflows/dep_build_test.yml      |  4 ++--
 .github/workflows/dep_run_examples.yml    |  4 ++--
 6 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/CreateRelease.yml b/.github/workflows/CreateRelease.yml
index a1d81ae92..d75ec163c 100644
--- a/.github/workflows/CreateRelease.yml
+++ b/.github/workflows/CreateRelease.yml
@@ -45,7 +45,7 @@ jobs:
   build-rust-windows:
     # see https://github.com/orgs/community/discussions/26286#discussioncomment-3251208 for why we need to check the ref
     if: ${{ contains(github.ref, 'refs/heads/release/') }} ||  ${{ github.ref=='refs/heads/main' }}
-    runs-on: windows-2022
+    runs-on: windows-2025
     needs: [release-blocker-check]
 
     steps:
@@ -75,7 +75,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        hypervisor: [hyperv, 'hyperv-ws2025', mshv3, kvm]
+        hypervisor: ['hyperv-ws2025', mshv3, kvm]
         cpu: [amd, intel]
     uses: ./.github/workflows/dep_benchmarks.yml
     secrets: inherit
@@ -148,9 +148,7 @@ jobs:
 
       - name: Archive benchmarks
         run: |
-          # windows (hyperv = Server 2022, hyperv-ws2025 = Server 2025)
-          tar -zcvf benchmarks_Windows_hyperv_amd.tar.gz benchmarks_Windows_hyperv_amd
-          tar -zcvf benchmarks_Windows_hyperv_intel.tar.gz benchmarks_Windows_hyperv_intel
+          # windows (server 2025)
           tar -zcvf benchmarks_Windows_hyperv-ws2025_amd.tar.gz benchmarks_Windows_hyperv-ws2025_amd
           tar -zcvf benchmarks_Windows_hyperv-ws2025_intel.tar.gz benchmarks_Windows_hyperv-ws2025_intel
           # kvm
@@ -176,8 +174,6 @@ jobs:
         if: ${{ contains(github.ref, 'refs/heads/release/') }}
         run: |
             gh release create v${{ env.HYPERLIGHT_VERSION }} -t "Release v${{ env.HYPERLIGHT_VERSION }}" --notes-file RELEASE_NOTES.md \
-            benchmarks_Windows_hyperv_amd.tar.gz \
-            benchmarks_Windows_hyperv_intel.tar.gz \
             benchmarks_Windows_hyperv-ws2025_amd.tar.gz \
             benchmarks_Windows_hyperv-ws2025_intel.tar.gz \
             benchmarks_Linux_kvm_amd.tar.gz \
@@ -194,8 +190,6 @@ jobs:
         run: |
             gh release delete dev-latest -y --cleanup-tag || true
             gh release create dev-latest -t "Latest prerelease from main branch" --notes-file RELEASE_NOTES.md --latest=false -p \
-            benchmarks_Windows_hyperv_amd.tar.gz \
-            benchmarks_Windows_hyperv_intel.tar.gz \
             benchmarks_Windows_hyperv-ws2025_amd.tar.gz \
             benchmarks_Windows_hyperv-ws2025_intel.tar.gz \
             benchmarks_Linux_kvm_amd.tar.gz \
diff --git a/.github/workflows/DailyBenchmarks.yml b/.github/workflows/DailyBenchmarks.yml
index 299707617..ce50a31b8 100644
--- a/.github/workflows/DailyBenchmarks.yml
+++ b/.github/workflows/DailyBenchmarks.yml
@@ -44,7 +44,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        hypervisor: [hyperv, 'hyperv-ws2025', mshv3, kvm]
+        hypervisor: ['hyperv-ws2025', mshv3, kvm]
         cpu: [amd, intel]
     uses: ./.github/workflows/dep_benchmarks.yml
     secrets: inherit
diff --git a/.github/workflows/ValidatePullRequest.yml b/.github/workflows/ValidatePullRequest.yml
index 278bf1dca..4f581962b 100644
--- a/.github/workflows/ValidatePullRequest.yml
+++ b/.github/workflows/ValidatePullRequest.yml
@@ -91,7 +91,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        hypervisor: [hyperv, 'hyperv-ws2025', mshv3, kvm]
+        hypervisor: ['hyperv-ws2025', mshv3, kvm]
         cpu: [amd, intel]
         config: [debug, release]
     uses: ./.github/workflows/dep_build_test.yml
@@ -114,7 +114,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        hypervisor: [hyperv, 'hyperv-ws2025', mshv3, kvm]
+        hypervisor: ['hyperv-ws2025', mshv3, kvm]
         cpu: [amd, intel]
         config: [debug, release]
     uses: ./.github/workflows/dep_run_examples.yml
diff --git a/.github/workflows/dep_benchmarks.yml b/.github/workflows/dep_benchmarks.yml
index 2579c7dae..5135aee18 100644
--- a/.github/workflows/dep_benchmarks.yml
+++ b/.github/workflows/dep_benchmarks.yml
@@ -74,8 +74,8 @@ jobs:
     timeout-minutes: 30
     runs-on: ${{ fromJson(
         format('["self-hosted", "{0}", "X64", "1ES.Pool=hld-{1}-{2}"]', 
-          (inputs.hypervisor == 'hyperv' || inputs.hypervisor == 'hyperv-ws2025') && 'Windows' || 'Linux', 
-          inputs.hypervisor == 'hyperv' && 'win2022' || inputs.hypervisor == 'hyperv-ws2025' && 'win2025' || inputs.hypervisor == 'mshv3' && 'azlinux3-mshv' || inputs.hypervisor, 
+          inputs.hypervisor == 'hyperv-ws2025' && 'Windows' || 'Linux', 
+          inputs.hypervisor == 'hyperv-ws2025' && 'win2025' || inputs.hypervisor == 'mshv3' && 'azlinux3-mshv' || inputs.hypervisor, 
           inputs.cpu)) }} 
     steps:
       - uses: actions/checkout@v6
diff --git a/.github/workflows/dep_build_test.yml b/.github/workflows/dep_build_test.yml
index 0c72baa66..8724350b6 100644
--- a/.github/workflows/dep_build_test.yml
+++ b/.github/workflows/dep_build_test.yml
@@ -40,8 +40,8 @@ jobs:
     timeout-minutes: 45
     runs-on: ${{ fromJson(
         format('["self-hosted", "{0}", "X64", "1ES.Pool=hld-{1}-{2}"]', 
-          (inputs.hypervisor == 'hyperv' || inputs.hypervisor == 'hyperv-ws2025') && 'Windows' || 'Linux', 
-          inputs.hypervisor == 'hyperv' && 'win2022' || inputs.hypervisor == 'hyperv-ws2025' && 'win2025' || inputs.hypervisor == 'mshv3' && 'azlinux3-mshv' || inputs.hypervisor, 
+          inputs.hypervisor == 'hyperv-ws2025' && 'Windows' || 'Linux', 
+          inputs.hypervisor == 'hyperv-ws2025' && 'win2025' || inputs.hypervisor == 'mshv3' && 'azlinux3-mshv' || inputs.hypervisor, 
           inputs.cpu)) }} 
     steps:
       - uses: actions/checkout@v6
diff --git a/.github/workflows/dep_run_examples.yml b/.github/workflows/dep_run_examples.yml
index 9645d8b8e..c14027703 100644
--- a/.github/workflows/dep_run_examples.yml
+++ b/.github/workflows/dep_run_examples.yml
@@ -40,8 +40,8 @@ jobs:
     timeout-minutes: 15
     runs-on: ${{ fromJson(
         format('["self-hosted", "{0}", "X64", "1ES.Pool=hld-{1}-{2}"]', 
-          (inputs.hypervisor == 'hyperv' || inputs.hypervisor == 'hyperv-ws2025') && 'Windows' || 'Linux', 
-          inputs.hypervisor == 'hyperv' && 'win2022' || inputs.hypervisor == 'hyperv-ws2025' && 'win2025' || inputs.hypervisor == 'mshv3' && 'azlinux3-mshv' || inputs.hypervisor, 
+          inputs.hypervisor == 'hyperv-ws2025' && 'Windows' || 'Linux', 
+          inputs.hypervisor == 'hyperv-ws2025' && 'win2025' || inputs.hypervisor == 'mshv3' && 'azlinux3-mshv' || inputs.hypervisor, 
           inputs.cpu)) }} 
     steps:
       - uses: actions/checkout@v6