From 83bb52b68293770f0043353c969ffe9fddfe3189 Mon Sep 17 00:00:00 2001 From: Ryan Foster Date: Wed, 10 Jun 2026 13:36:07 -0400 Subject: [PATCH] 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 --- .github/workflows/analyze-project.yaml | 2 +- .github/workflows/build-project.yaml | 2 +- .github/workflows/dispatch.yaml | 2 +- .github/workflows/publish.yaml | 2 +- .github/workflows/sign-windows.yaml | 2 +- CMakePresets.json | 8 ++++---- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/analyze-project.yaml b/.github/workflows/analyze-project.yaml index ebdc6e53f..767e2f581 100644 --- a/.github/workflows/analyze-project.yaml +++ b/.github/workflows/analyze-project.yaml @@ -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: diff --git a/.github/workflows/build-project.yaml b/.github/workflows/build-project.yaml index 6c98ef9e6..f00490c6b 100644 --- a/.github/workflows/build-project.yaml +++ b/.github/workflows/build-project.yaml @@ -379,7 +379,7 @@ jobs: strategy: matrix: architecture: [x64, arm64] - runs-on: windows-2022 + runs-on: windows-2025-vs2026 needs: check-event defaults: run: diff --git a/.github/workflows/dispatch.yaml b/.github/workflows/dispatch.yaml index a1d9ce765..aa87a56b4 100644 --- a/.github/workflows/dispatch.yaml +++ b/.github/workflows/dispatch.yaml @@ -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 diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index bda7ed4ed..27645b03b 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -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 diff --git a/.github/workflows/sign-windows.yaml b/.github/workflows/sign-windows.yaml index 4b946b1f0..3461febaf 100644 --- a/.github/workflows/sign-windows.yaml +++ b/.github/workflows/sign-windows.yaml @@ -7,7 +7,7 @@ jobs: strategy: matrix: architecture: [x64, arm64] - runs-on: windows-2022 + runs-on: windows-2025-vs2026 environment: name: bouf defaults: diff --git a/CMakePresets.json b/CMakePresets.json index 95225fcd3..b43ca9d13 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -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"},