Skip to content

Commit b76d0a6

Browse files
authored
Remove windows server 2022 from ci (#1319)
Signed-off-by: Ludvig Liljenberg <4257730+ludfjig@users.noreply.github.com>
1 parent e1adf51 commit b76d0a6

File tree

6 files changed

+12
-18
lines changed

6 files changed

+12
-18
lines changed

.github/workflows/CreateRelease.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
build-rust-windows:
4646
# see https://github.com/orgs/community/discussions/26286#discussioncomment-3251208 for why we need to check the ref
4747
if: ${{ contains(github.ref, 'refs/heads/release/') }} || ${{ github.ref=='refs/heads/main' }}
48-
runs-on: windows-2022
48+
runs-on: windows-2025
4949
needs: [release-blocker-check]
5050

5151
steps:
@@ -75,7 +75,7 @@ jobs:
7575
strategy:
7676
fail-fast: true
7777
matrix:
78-
hypervisor: [hyperv, 'hyperv-ws2025', mshv3, kvm]
78+
hypervisor: ['hyperv-ws2025', mshv3, kvm]
7979
cpu: [amd, intel]
8080
uses: ./.github/workflows/dep_benchmarks.yml
8181
secrets: inherit
@@ -148,9 +148,7 @@ jobs:
148148

149149
- name: Archive benchmarks
150150
run: |
151-
# windows (hyperv = Server 2022, hyperv-ws2025 = Server 2025)
152-
tar -zcvf benchmarks_Windows_hyperv_amd.tar.gz benchmarks_Windows_hyperv_amd
153-
tar -zcvf benchmarks_Windows_hyperv_intel.tar.gz benchmarks_Windows_hyperv_intel
151+
# windows (server 2025)
154152
tar -zcvf benchmarks_Windows_hyperv-ws2025_amd.tar.gz benchmarks_Windows_hyperv-ws2025_amd
155153
tar -zcvf benchmarks_Windows_hyperv-ws2025_intel.tar.gz benchmarks_Windows_hyperv-ws2025_intel
156154
# kvm
@@ -176,8 +174,6 @@ jobs:
176174
if: ${{ contains(github.ref, 'refs/heads/release/') }}
177175
run: |
178176
gh release create v${{ env.HYPERLIGHT_VERSION }} -t "Release v${{ env.HYPERLIGHT_VERSION }}" --notes-file RELEASE_NOTES.md \
179-
benchmarks_Windows_hyperv_amd.tar.gz \
180-
benchmarks_Windows_hyperv_intel.tar.gz \
181177
benchmarks_Windows_hyperv-ws2025_amd.tar.gz \
182178
benchmarks_Windows_hyperv-ws2025_intel.tar.gz \
183179
benchmarks_Linux_kvm_amd.tar.gz \
@@ -194,8 +190,6 @@ jobs:
194190
run: |
195191
gh release delete dev-latest -y --cleanup-tag || true
196192
gh release create dev-latest -t "Latest prerelease from main branch" --notes-file RELEASE_NOTES.md --latest=false -p \
197-
benchmarks_Windows_hyperv_amd.tar.gz \
198-
benchmarks_Windows_hyperv_intel.tar.gz \
199193
benchmarks_Windows_hyperv-ws2025_amd.tar.gz \
200194
benchmarks_Windows_hyperv-ws2025_intel.tar.gz \
201195
benchmarks_Linux_kvm_amd.tar.gz \

.github/workflows/DailyBenchmarks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
strategy:
4545
fail-fast: true
4646
matrix:
47-
hypervisor: [hyperv, 'hyperv-ws2025', mshv3, kvm]
47+
hypervisor: ['hyperv-ws2025', mshv3, kvm]
4848
cpu: [amd, intel]
4949
uses: ./.github/workflows/dep_benchmarks.yml
5050
secrets: inherit

.github/workflows/ValidatePullRequest.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ jobs:
9191
strategy:
9292
fail-fast: true
9393
matrix:
94-
hypervisor: [hyperv, 'hyperv-ws2025', mshv3, kvm]
94+
hypervisor: ['hyperv-ws2025', mshv3, kvm]
9595
cpu: [amd, intel]
9696
config: [debug, release]
9797
uses: ./.github/workflows/dep_build_test.yml
@@ -114,7 +114,7 @@ jobs:
114114
strategy:
115115
fail-fast: true
116116
matrix:
117-
hypervisor: [hyperv, 'hyperv-ws2025', mshv3, kvm]
117+
hypervisor: ['hyperv-ws2025', mshv3, kvm]
118118
cpu: [amd, intel]
119119
config: [debug, release]
120120
uses: ./.github/workflows/dep_run_examples.yml

.github/workflows/dep_benchmarks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ jobs:
7474
timeout-minutes: 30
7575
runs-on: ${{ fromJson(
7676
format('["self-hosted", "{0}", "X64", "1ES.Pool=hld-{1}-{2}"]',
77-
(inputs.hypervisor == 'hyperv' || inputs.hypervisor == 'hyperv-ws2025') && 'Windows' || 'Linux',
78-
inputs.hypervisor == 'hyperv' && 'win2022' || inputs.hypervisor == 'hyperv-ws2025' && 'win2025' || inputs.hypervisor == 'mshv3' && 'azlinux3-mshv' || inputs.hypervisor,
77+
inputs.hypervisor == 'hyperv-ws2025' && 'Windows' || 'Linux',
78+
inputs.hypervisor == 'hyperv-ws2025' && 'win2025' || inputs.hypervisor == 'mshv3' && 'azlinux3-mshv' || inputs.hypervisor,
7979
inputs.cpu)) }}
8080
steps:
8181
- uses: actions/checkout@v6

.github/workflows/dep_build_test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ jobs:
4040
timeout-minutes: 45
4141
runs-on: ${{ fromJson(
4242
format('["self-hosted", "{0}", "X64", "1ES.Pool=hld-{1}-{2}"]',
43-
(inputs.hypervisor == 'hyperv' || inputs.hypervisor == 'hyperv-ws2025') && 'Windows' || 'Linux',
44-
inputs.hypervisor == 'hyperv' && 'win2022' || inputs.hypervisor == 'hyperv-ws2025' && 'win2025' || inputs.hypervisor == 'mshv3' && 'azlinux3-mshv' || inputs.hypervisor,
43+
inputs.hypervisor == 'hyperv-ws2025' && 'Windows' || 'Linux',
44+
inputs.hypervisor == 'hyperv-ws2025' && 'win2025' || inputs.hypervisor == 'mshv3' && 'azlinux3-mshv' || inputs.hypervisor,
4545
inputs.cpu)) }}
4646
steps:
4747
- uses: actions/checkout@v6

.github/workflows/dep_run_examples.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ jobs:
4040
timeout-minutes: 15
4141
runs-on: ${{ fromJson(
4242
format('["self-hosted", "{0}", "X64", "1ES.Pool=hld-{1}-{2}"]',
43-
(inputs.hypervisor == 'hyperv' || inputs.hypervisor == 'hyperv-ws2025') && 'Windows' || 'Linux',
44-
inputs.hypervisor == 'hyperv' && 'win2022' || inputs.hypervisor == 'hyperv-ws2025' && 'win2025' || inputs.hypervisor == 'mshv3' && 'azlinux3-mshv' || inputs.hypervisor,
43+
inputs.hypervisor == 'hyperv-ws2025' && 'Windows' || 'Linux',
44+
inputs.hypervisor == 'hyperv-ws2025' && 'win2025' || inputs.hypervisor == 'mshv3' && 'azlinux3-mshv' || inputs.hypervisor,
4545
inputs.cpu)) }}
4646
steps:
4747
- uses: actions/checkout@v6

0 commit comments

Comments
 (0)