CI: Update to Windows 2025 with VS 2026

This will also allow us to move to clang-format 22 which ships with
VS 2026.

 * Update the CI image to windows-2025-vs2026
 * Update VS generator to 2026
 * Update Windows SDK to 26100
This commit is contained in:
Ryan Foster
2026-06-10 13:36:07 -04:00
parent 84b8d16134
commit 83bb52b682
6 changed files with 9 additions and 9 deletions

View File

@@ -4,7 +4,7 @@ on:
jobs:
windows:
name: Windows 🪟 (PVS-Studio)
runs-on: windows-2022
runs-on: windows-2025-vs2026
if: false && github.repository_owner == 'obsproject'
defaults:
run:

View File

@@ -379,7 +379,7 @@ jobs:
strategy:
matrix:
architecture: [x64, arm64]
runs-on: windows-2022
runs-on: windows-2025-vs2026
needs: check-event
defaults:
run:

View File

@@ -139,7 +139,7 @@ jobs:
windows-patches:
name: Create Windows Patches 🩹
if: github.repository_owner == 'obsproject' && inputs.job == 'patches'
runs-on: windows-2022
runs-on: windows-2025-vs2026
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: ./.github/actions/windows-patches

View File

@@ -246,7 +246,7 @@ jobs:
name: Create Windows Patches 🩹
needs: check-tag
if: github.repository_owner == 'obsproject' && fromJSON(needs.check-tag.outputs.validTag)
runs-on: windows-2022
runs-on: windows-2025-vs2026
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: ./.github/actions/windows-patches

View File

@@ -7,7 +7,7 @@ jobs:
strategy:
matrix:
architecture: [x64, arm64]
runs-on: windows-2022
runs-on: windows-2025-vs2026
environment:
name: bouf
defaults:

View File

@@ -162,9 +162,9 @@
"lhs": "${hostSystemName}",
"rhs": "Windows"
},
"architecture": "x64,version=10.0.22621.0",
"architecture": "x64,version=10.0.26100.0",
"binaryDir": "${sourceDir}/build_x64",
"generator": "Visual Studio 17 2022",
"generator": "Visual Studio 18 2026",
"cacheVariables": {
"GPU_PRIORITY_VAL": {"type": "STRING", "value": "$penv{GPU_PRIORITY_VAL}"},
"VIRTUALCAM_GUID": {"type": "STRING", "value": "A3FCE0F5-3493-419F-958A-ABA1250EC20B"},
@@ -191,9 +191,9 @@
"lhs": "${hostSystemName}",
"rhs": "Windows"
},
"architecture": "ARM64,version=10.0.22621.0",
"architecture": "ARM64,version=10.0.26100.0",
"binaryDir": "${sourceDir}/build_arm64",
"generator": "Visual Studio 17 2022",
"generator": "Visual Studio 18 2026",
"cacheVariables": {
"GPU_PRIORITY_VAL": {"type": "STRING", "value": "$penv{GPU_PRIORITY_VAL}"},
"VIRTUALCAM_GUID": {"type": "STRING", "value": "A3FCE0F5-3493-419F-958A-ABA1250EC20B"},